[cvsnt] Re: co getting wrong versions?

[Tony Hoyle]

David Somers wrote:
> Greetings,
> 
> The attached png shows the layout of a file in my repository.
> 
> # cvs co -j FRED_1_FIXES -j FRED_2_FIXES prj/fred
> cvs server: Updating prj/fred
> U prj/fred/fred.c
> RCS file: /omz13/prj/fred/fred.c,v
> retrieving revision 1.1.1.1.2.1
> retrieving revision 1.1.1.1
> Merging differences between 1.1.1.1.2.1 and 1.1.1.1 into fred.c
> rcsmerge: warning: conflicts during merge
> C prj/fred/fred.c
> 
> Now that looks ok to me... I'm trying to merge the two branches, and its
> cvsnt says its retrieving right the revisions.
> 
> However, when I look at the file its splated out (prj/fred/fred.c), what its
> actually done is merged revisions 1.1.1.1.2.1 and 1.1.1.2 (but it says it
> was doing 1.1.1.1).

Presumably 1.1.1.2 was in your sandbox - this is a 3-way merge, with the 
diff between 1.1.1.1.2.1 and 1.1.1.1 being merged into whatever was in 
the sandbox already.

If you want to just merge between two branches update to one and merge 
with the other.

Tony