Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to email@example.com.
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 18.104.22.168 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 | | | | 22.214.171.124 --->1.4 | | | 1.5<--- 126.96.36.199 (minor change not included in 188.8.131.52) 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 184.108.40.206 Merging differences between 1.2 and 220.127.116.11 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 18.104.22.168 retrieving revision 22.214.171.124 Merging differences between 126.96.36.199 and 188.8.131.52 into tekst.txt THIS IS WRONG: The last merge is made from a diff between 184.108.40.206 and 220.127.116.11 and NOT 1.2 and 18.104.22.168 (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 22.214.171.124 and a CVSNT server 126.96.36.199 build 72. Best regards Christian Ottosen