You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Thierry Lam <la...@pcigeomatics.com> on 2006/09/01 16:57:28 UTC

How's subversion branch merging better than CVS?

Can anyone tell me the advantages and disadvantages of branch merging of
SVN over CVS?

 

Thierry

Re: How's subversion branch merging better than CVS?

Posted by Jamie Wellnitz <Ja...@emulex.com>.

On Fri, Sep 01, 2006 at 12:57:28PM -0400, Thierry Lam wrote:
>    Can anyone tell me the advantages and disadvantages of branch merging of
>    SVN over CVS?

Generally, I would say merging in SVN is quite a bit easier than in
CVS.

Repeated merging in CVS requires tags to mark each merge.  SVN's
atomic commits and repository-wide revision numbers remove the need
for tags, but there's still some bookkeeping.

Cherry-picking changes from one branch to another is easier is SVN
than in CVS, mainly because it's easy to identify a commit by revision
number.

The svnmerge.py script, while not strictly part of SVN (it's in
contrib), handles a good deal of the merge bookkeeping.

There's clearly room for improvement in merge tracking in SVN, though.

> 
>    Thierry

Regards,
	Jamie

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org