|Subject:||merging 2 versions|
|Date:||Sat, 30 Jun 2001 04:34:11|
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
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??
|[Prev in Thread]||Current Thread||[Next in Thread]|