RE: CVS Merge, No Conflict

[Abhishek_Sharma04]

Hi Stuart,

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?

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 11:56 AM
To: Abhishek_Sharma04
Cc: address@hidden
Subject: Re: CVS Merge, No Conflict

The second time you merge changes into the trunk you need two -j
options.
See http://cvsbook.red-bean.com/cvsbook.html#Multiple%20Merges

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