[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging multible branches

From: Larry Jones
Subject: Re: Merging multible branches
Date: Thu, 11 Sep 2003 10:53:24 -0400 (EDT)

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
> retrieving revision
> Merging differences between and into tekst.txt

If Branch2 were rooted where you think it is, the first revision
retrieved would have been 1.2, not  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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]