[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Bi-directional merge
From: |
calin . hanchevici |
Subject: |
Bi-directional merge |
Date: |
17 Nov 2006 07:03:08 -0800 |
User-agent: |
G2/1.0 |
Hi,
I have a branch B that is synchronized periodically with the trunk. I
want to do a final merge of my branch into the trunk and I got into a
strange situation.
A merge in B removed some code in one file (myfile.txt), the file was
corrected and committed in B, on merge into the trunk I don't get the
changes but I get a message that myfile.txt already contains the
differences between 1.2 and 1.2.14.2.
trunk
|
B_start 1.2----\
| |
1.3 |
merge |==>1.2.14.1 here code is removed
| |
correct | |
code | 1.2.14.2 this revision is identical with 1.2
| |
merge |<==|
back
I am using cvs update -jB_start -jB_tip. Am I doing something wrong
here?
How should I manage the merges to overcome this problem?
Thank you for your time.
Calin
Calin
- Bi-directional merge,
calin . hanchevici <=