RE: CVS Vs PVCS

For parallel development we used to branching and then merge with the
head which you can do using cvs commands from command line.

E.g. "cvs update -j Branch Head" and then "cvs commit -m "merged Branch
onto Head" Head Folder"

With this we can do batch merge without any manual supervision where
there is no conflict within the same piece of code.



My question is this merge process authentic? How efficiently it can
merge two branches? We do not have such facility in PVCS. Please confirm



Regards,







________________________________

From: [email protected] [mailto:[email protected]] On Behalf
Of Bo Berglund
Sent: Saturday, October 07, 2006 2:58 AM
To: [email protected]
Subject: Re: [cvsgui] CVS Vs PVCS





>
>Should we use the batch merge facility in cvs for reconciliation? Is it
>able to reconcile correctly?
>

Exactly *what* do you mean by this question?
What is "reconcile"? It is not a cvs term that I can remember...
And what do you mean by "batch merge"????

HTH

/Bo
(Bo Berglund, developer in Sweden)





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

[Non-text portions of this message have been removed]



 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/cvsgui/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:[email protected] 
    mailto:[email protected]

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/