info-cvs
[Top][All Lists]
Advanced

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

Re: CVS Merge, No Conflict


From: Jim Hyslop
Subject: Re: CVS Merge, No Conflict
Date: Fri, 02 Sep 2005 11:23:44 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Abhishek_Sharma04 wrote:
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

There will come a time when you will need to know where the root of cr_abc is. Without the non-branch tag, it will be very difficult to determine precisely where the root is.

After a branch is merged to the trunk, does any further work proceed on that branch, or is it for all intents and purposes dead?

2. Our project requirements are such that multiple developers work in
parallel and to ensure no interference I need to provide multiple
branches.
Are the developers working on different features, which may get incorporated into different releases?

[note: please trim your posts]


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

Disclaimers such as this, when posting to a public forum, are ridiculous. Please speak to the powers-that-be in your company to ask them to stop making your company look stupid.

--
Jim





reply via email to

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