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

Re: Merging insanity

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2005-09-02 01:52:07 CEST

On 9/1/05, Ian Eure <ieure@enotes.com> wrote:
> On Sep 1, 2005, at 3:23 PM, Ben Collins-Sussman wrote:
> >
> > Is all the fuss about trying to find the revision which is the
> > 'base' of the branch? The whole running 'svn log --stop-on-copy'
> > to figure out when the branch was created?
> >
> > Why not, when creating the branch, also make a tag of it:
> >
> > $ svn cp trunkURL branchURL
> > $ svn cp branchURL branch-beginning-tag-URL
> >
> > [...make changes on branch...]
> >
> > $ svn checkout trunkURL; cd trunk
> > $ svn merge branch-beginning-tag-URL branchURL
>
> Still too much work. And I believe you omitted the delete/recreate
> step for thee branch-beginning tag, which is still more work.

I am not sure about delete/recreate. There was no discussion about
that. As for the creation of the branch-beginning tag, thats what you
would do in CVS -- you will have to create a branch-tag first and then
create the branch and then merge. Same number of steps.

> And creating new tags/branches slooooooow.

Are you talking about CVS or SVN?
If you are talking about SVN, then you have not read the book or tried
out branching examples yet. Apart from atomic commits, the best thing
I like about SVN is that it branches/tags in a snap. Try it out. I am
sure you will love it.

>
> But this is my point - Subversion knows (or should know) the revision
> at which a branch was created, so why is all this screwing around
> with revision numbers and tags necessary in the first place?
>

This is because subversion can not assume that the user wants to merge
every change from the branch. You might want to merge only some
changes from the branch (as in periodic merges -- now, now, don't tell
me that its a lot more work to do periodic merges in SVN. it has been
flagged in the book and it also provides suggestions to handle such
situations).

-Hari
SpikeSource Inc.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 2 01:53:41 2005

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