RE: CVS Merge, No Conflict

[Abhishek_Sharma04]

Hi Stuart,

Some more queries on your answers:
1. How does creation of non-branch tags help. Isn't it same as merging
upon a version. Basically what I want to know is how is this different
from what we currently do say:
- cvs upd -j cr_abc

2. Our project requirements are such that multiple developers work in
parallel and to ensure no interference I need to provide multiple
branches. Another complexity of the project is that there are frequent
releases due to which by the time a development started on say 1.87 will
finish the trunk would already be at say 1.90. So for testing purposes
we first create another branch based on last baseline (1.90 in this
case), merge changes of development branch on this branch (which I refer
to as string) and test the changes in isolation. After that everything
is integrated and merged on trunk. The idea behind doing so is that the
trunk is not touched till the individual changes are thoroughly tested.
Due to this we end up having 2 branches for each development work.

Your suggestions on the same.

Regards,
Abhishek Sharma
Infosys Australia
Tel:   + 61 3 9860 2294
Mob: + 61 400 145 107
Fax:  + 61 3 9860 2999
www.infosys.com
Powered by Intellect
         Driven by Values


-----Original Message-----
From: Stuart Cooper [mailto:address@hidden
Sent: Friday, September 02, 2005 12:15 PM
To: Abhishek_Sharma04
Cc: address@hidden
Subject: Re: CVS Merge, No Conflict

> I would have agreed with you had the merging been from the same branch
> to the trunk. But in this case the merging is from different branches.
> Can you please suggest what command you would have used in that
> condition?

There's an unwritten law to always create a non-branch tag before you
create your branch tags. Let's say you'd done this and had tags on your
trunk called pre1_87 and pre1_90.

Then to merge your 1.87 branch changes into the trunk, you'd say

A) cvs upd -j pre1_87 -j cr_abc

Now to merge your 1.90 branch changes into the trunk, you'd say

B) cvs upd -j pre1_90 -j cr_abc_str

Not sure what you mean by a "string branch", I've never heard this
terminology before.

By the sounds of it you might have merged some stuff from the cr_abc
branch
to the cr_abc_str branch anyhow- so when you then try to merge that
branch
onto the trunk you might get the double merge conflict problem. You
might
just want the changes in cr_abc branch *after* it was folded into
cr_abc_str branch.

This very quickly gets complicated, as you're experiencing, which is
why as a general
rule keep the number of branches to a minimum.

Cheers,
Stuart.

**************** 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***