[cvsnt] Bug in merging multiple branches

[Christian Ottosen]

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)

DESCRIPTION:
I reproduced the problem in a test case like this:

                     1.1
                       |
[Branch1]--- 1.2 ---[Branch2]
        |              |              |
        |            1.3            |
        |              |              |
  1.2.2.1 --->1.4            |
                       |              |
                     1.5<--- 1.2.4.1 (minor change not included in 1.2.2.1)

The merge of "Branch1" results in:
cvs update -P -jBranch1 tekst.txt (in directory
C:\CVSsandbox_SCADA\testmodules\cso\Dir\)
RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into tekst.txt

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

THIS IS WRONG: The last merge is made from a diff between 1.2.2.1 and
1.2.4.1 and NOT 1.2 and 1.2.4.1 (Now I loose my changes made in "Branch1")?


I have reproduced the test case on a Unix cvs-server and found that the
merge was done CORRECTLY.

SETUP:
I am running WinCVS 1.3.12.1 and a CVSNT server 1.11.1.3 build 72.

Best regards
Christian Ottosen