merging 2 versions

[Deepak Khugher]

Hi,

 

I am trying to merge two branches (both sticky) using the following command in a checked out copy of Revision2

cvs update -j Revision1 -j Revision2

OR

cvs update -j Revision1 -j Revision2  file1

In the former case I get the output stating Updating Dir1 ....

In the latter case I donot get any output.

But when I check the code, the changes have not been merged. Any suggestions??

 

Thanks,

Deepak

 

---

Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.