Merging multible branches.
PROBLEM:
I loose my merged branch changes if another branch is merged to the trunk afterward.
QUESTION:
How does CVS merge a branch, if multible branch points exists on the same trunk
version.
DESCRIPTION:
I reproduced the problem 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
And now the changes made in 1.2.2.1 and merged into 1.4, is removed in this last
merge.
How can that happen??????
I have always believed that ONLY changes in the branch is merged. But the output of
the merge command for "Branch2" indicates that a diff is beeing made between the two
branches, and this diff is merged into the trunk (Now I loose my changes made in
"Branch1")???
Med venlig hilsen / Yours sincerely / Mit freundlichen Grüssen
Christian Schultz Ottosen
Software Developer
M.Sc.E.E.
E-mail: [EMAIL PROTECTED]
MITA-TEKNIK A/S
Håndværkervej 1
8840 Rødkærsbro
Denmark
Tel: +45 86 65 86 00
Fax: +45 86 65 92 90
<www.mita-teknik.com>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
