info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

merge question


From: Kesavan T.S
Subject: merge question
Date: Sun, 29 Oct 2006 23:33:10 -0500

Hi,
I have file File1 in 2 branches B1 and B2. There was a change which was required only in B1 and was not applied to B2. However during next merge on B2 the cvs update -j brings those changes.
Eg:
File1 -> changed in branch B1 1.2.2.4 to -> 1.2.2.5
content:
1.2.2.4->
line 1: CHANGE in both B1 and B2
1.2.2.5->
line 2 : CHANGE only in B1 do not merge into B2
-----------------------
File1 -> changed in branch B1 1.2.2.5 to - 1.2.2.6
content:
1.2.2.4->
line 1: CHANGE in both B1 and B2
1.2.2.5->
line 2 : CHANGE only in B1 do not merge into B2
1.2.2.6->
line 3 : CHANGE2 in both B1 and B2
------------

File1 (based on 1.2.2.4) in branch B2 1.1.4.4
line 1: CHANGE in both B1 and B2

When i do
cvs update -j 1.2.2.5 -j 1.2.2.6 -r B2 File1
The output is
line 1: CHANGE in both B1 and B2
line 2 : CHANGE only in B1 do not merge into B2
line 3 : CHANGE2 in both B1 and B2
Whenever we make change to B1 we regularly merge using cvs update -j rev1 - j rev2 unless its not required.

Does cvs update -j -j 1.2.2.5 -j 1.2.2.6 -r B2 File1 merges only delta difference between 1.2.2.5 and 1.2.2.6 or tries to bring all the diffs till 1.2.2.6 (assuming changes in B2 was periodically merged from B1)

Thanks and Regards,
kesavan

_________________________________________________________________
Try Search Survival Kits: Fix up your home and better handle your cash with Live Search! http://imagine-windowslive.com/search/kits/default.aspx?kit=improve&locale=en-US&source=hmtagline





reply via email to

[Prev in Thread] Current Thread [Next in Thread]