[Top][All Lists]

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

CVS Merge, No Conflict

From: Abhishek_Sharma04
Subject: CVS Merge, No Conflict
Date: Fri, 2 Sep 2005 11:36:23 +1000


I found a bug while merging a file and wanted to know if there is some problem 
with the way we perform merging or it's an inherent CVS bug.
The CVS version we are currently using is 1.11.17.
The scenario is as follows:

+----+     +----+     +----+     +----+     +----+     +----+     +----+        
!1.87! --- !1.88! --- !1.89! --- !1.90! --- !1.91! --- !1.92! --- !1.93!
+----+     +----+     +----+     +----+     +----+     +----+  ^  +----+
    |                               |                          |  
    |                               |                          |                                             |
    |                               |                          |
    |                               |                          |
    |                               |                          | ---------------------> --------------------> 

We created a development branch for which the file version was 1.87
Some fixes were added to trunk and baselined at 1.88.
A string branch was created for testing based on 1.90 and changes of 
development branch merged on that. This was the place where the fixes of 1.88 
were overridden on string branch as development branch never had those fixes. 
Later this string branch was added to the trunk and again there were no 
conflicts shown by CVS and the bug got merged onto the trunk.

For all merging the commands were preety usual:
For string branch:
Cvs upd -j  cr_abc <file_name>

For trunk:
The trunk was first checked out and then string changes were merged
Cvs upd -j cr_abc_str <file_name>

We first thought that we did some mistake while merge and didn't observe the 
confict. But we were able to reproduce the same scenario again.

Kindly suggest how we can avoid this issue.
Let me know if you need any more details on this issue.
Thanking you in advance.  


Abhishek Sharma 
Infosys Australia
Tel:   + 61 3 9860 2294
Mob: + 61 400 145 107
Fax:  + 61 3 9860 2999
Powered by Intellect
         Driven by Values

**************** CAUTION - Disclaimer *****************
This e-mail contains PRIVILEGED AND CONFIDENTIAL INFORMATION intended solely 
for the use of the addressee(s). If you are not the intended recipient, please 
notify the sender by e-mail and delete the original message. Further, you are 
not to copy, disclose, or distribute this e-mail or its contents to any other 
person and any such actions are unlawful. This e-mail may contain viruses. 
Infosys has taken every reasonable precaution to minimize this risk, but is not 
liable for any damage you may sustain as a result of any virus in this e-mail. 
You should carry out your own virus checks before opening the e-mail or 
attachment. Infosys reserves the right to monitor and review the content of all 
messages sent to or from this e-mail address. Messages sent to or from this 
e-mail address may be stored on the Infosys e-mail system.
***INFOSYS******** End of Disclaimer ********INFOSYS***

reply via email to

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