Re: Merging multible branches

[Larry Jones]

Christian Schultz Ottosen writes:
> 
> The merge of "Branch2" results in:
> 
> cvs update -P -jBranch2 tekst.txt (in directory 
> C:\CVSsandbox_SCADA\testmodules\cso\Dir\)
> RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v
> retrieving revision 1.2.2.1
> retrieving revision 1.2.4.1
> Merging differences between 1.2.2.1 and 1.2.4.1 into tekst.txt

If Branch2 were rooted where you think it is, the first revision
retrieved would have been 1.2, not 1.2.2.1.  Can you do a status -v on
the file and post the results?

-Larry Jones

He's just jealous because I accomplish so much more than he does. -- Calvin