[cvsnt] Bug in merging multiple branches

[Phil Richards]

On 2003-09-15, Christian Ottosen <cso at mita-teknik.com> wrote:
>  PROBLEM:
>  Merge of branches is done incorrectly, if two or more branches from the same
>  branch point is merged to the trunk.
> 
>  QUESTION:
>  Is this at known bug, and is it solved in cvsnt server versions after
>  1.11.1.3 build 72. (The bug could not be found on a Unix cvs server)

You should really upgrade to the latest version (2.0.9).  Be aware, however,
that there are some significant differences to do with server script execution
etc - read the change history information on www.cvsnt.org!

For the record, below is what happens with 2.0.9 in the scenario you
showed.  Everything seems to work fine...

phil

% cvs -q add test7.file
 
% cvs -q commit -mcreated test7.file
Checking in test7.file;
initial revision: 1.1
 
% cvs -q commit -mAdded on mainline - 1 test7.file
Checking in test7.file;
new revision: 1.2; previous revision: 1.1
 
% cvs -q tag -b b1 test7.file
T test7.file
 
% cvs -q tag -b b2 test7.file
T test7.file
 
% cvs -q update -rb1 test7.file
 
% cvs -q commit -mAdded on b1 - 1 test7.file
Checking in test7.file;
new revision: 1.2.2.1; previous revision: 1.2
 
% cvs -q update -rb2 test7.file
U test7.file
 
% cvs -q commit -mAdded on b2 - 1 test7.file
Checking in test7.file;
new revision: 1.2.4.1; previous revision: 1.2
 
% cvs -q update -A test7.file
U test7.file
 
% cvs -q commit -mAdded on mainline - 2 test7.file
Checking in test7.file;
new revision: 1.3; previous revision: 1.2
 
% cvs -q -ttt update -jb1 test7.file
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into test7.file
rcsmerge: warning: conflicts during merge
C test7.file
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
Initial file contents
Added on mainline - 1
<<<<<<< test7.file
Added on mainline - 2
=======
Added on b1 - 1
>>>>>>> 1.2.2.1
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>

automatically resolving conflict by accepting both sides

<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
Initial file contents
Added on mainline - 1
Added on mainline - 2
Added on b1 - 1
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
 
% cvs -q commit -mmerged b1 test7.file
Checking in test7.file;
new revision: 1.4; previous revision: 1.3
 
% cvs -q -ttt update -jb2 test7.file
retrieving revision 1.2
retrieving revision 1.2.4.1
Merging differences between 1.2 and 1.2.4.1 into test7.file
rcsmerge: warning: conflicts during merge
C test7.file
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
Initial file contents
Added on mainline - 1
<<<<<<< test7.file
Added on mainline - 2
Added on b1 - 1
=======
Added on b2 - 1
>>>>>>> 1.2.4.1
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>

automatically resolving conflict by accepting both sides

<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
Initial file contents
Added on mainline - 1
Added on mainline - 2
Added on b1 - 1
Added on b2 - 1
<<<<<<<<<<<<<<<<<<<<<<<<========================>>>>>>>>>>>>>>>>>>>>>>>>
 
% cvs -q commit -mmerged b2 test7.file
Checking in test7.file;
new revision: 1.5; previous revision: 1.4
 
-- 
change name before "@" to "phil" for email