[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-09-01 20:46:56 CEST

As far as Subversion itself is concerned, a "branch" is nothing more
than a copy, so it would look in a repository browser like any other
copy.

On 9/1/06, Thierry Lam <lam@pcigeomatics.com> wrote:
> Do you have a screenshot of the SVN branching from a SVN repository
> browser that I can look at?
>
> Thierry
>
> -----Original Message-----
> From: Jamie Wellnitz [mailto:Jamie.Wellnitz@emulex.com]
> Sent: Friday, September 01, 2006 1:18 PM
> To: Thierry Lam
> Cc: users@subversion.tigris.org
> Subject: Re: How's subversion branch merging better than CVS?
>
> 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
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 1 20:48:39 2006

This is an archived mail posted to the Subversion Users mailing list.