Re: CVS Vs PVCS

On 2006-10-08 08:55:07, Arup Kumar Laha wrote:

> 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

It is "authentic" in that it works and textually merges code. But don't be
fooled into thinking that just because a merge went well textually without
creating any conflicts the result necessarily is correct. IME it is always
necessary to review all merge changes, even if there was no conflict. The
merge algorithm does not know anything about syntax, let alone semantics :)

It is also "authentic" in the sense that many people use it successfully. 

OTOH, I don't think it's any different (in the results) from checking out
the common ancestor and both merge candidates and use a client-side merging
tool.

Gerhard



 
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/