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

RE: branching several times a day (was Re: Sourcesafe user needs primer on branching source control)

From: Ove Kaaven <ovek_at_arcticnet.no>
Date: 2004-03-13 01:46:05 CET

fre, 12.03.2004 kl. 22.38 skrev Rob van Oostrum:
> > -----Original Message-----
> > From: Ove Kaaven [mailto:ovek@arcticnet.no]
> > Sent: Friday, March 12, 2004 4:26 PM
> > To: Rob van Oostrum
> > Cc: users@subversion.tigris.org
> > Subject: RE: branching several times a day (was Re: Sourcesafe user
> > needs primer on branching source control)
> >
> >
> > The "bottom" of the branch is just the trunk at the time the
> > branch was
> > created, right? And that's what you wish to diff against. So, just tag
> > the trunk when you merge trunk into the branch. After
> > merging, diff the
> > the branch against that tag to see the actual changes in the branch.
> > Problem solved.
>
> Not exactly ... by "top" I mean the start of the branch ... by "bottom" the
> latest on the branch ... anyways ...
>
> Of course I tag the point from which I create the branch. And of course I
> can do a diff between that tag and any point on the branch (tag or latest).
> My point was that by merging trunk changes into a branch, the difference
> between the top and bottom of the branch no longer represents just the
> changes made on that branch for the purpose the branch was created, but also
> whatever difference between the start of the branch and points further down
> on the trunk you chose to merge into the branch. This may not be an issue in
> a lot of environments, but it is a major pain in the butt in mine ...

I'm not sure if you're saying this because you misunderstood me, or
because you understood me but have other issues with it, which you are
simply being vague about. I'll try to explain what I meant just in case.
Ignore me if you got it the first time.

So when you create a branch, you tag the newly created branch, marking
it "top". Then you do a bunch of work on that branch. Meanwhile, piles
of work happens on the trunk. Now you decide you want the trunk changes
into your branch, in preparation for stabilization and merging back to
trunk.

- Tag the new trunk revision (svn cp trunk branch-merge-tag)
- Merge from trunk (svn merge branch-top branch-merge-tag)
- Continue working on branch
- Diff at will (svn diff branch-merge-tag branch)
- Repeat as needed
- Merge into trunk (svn merge branch-merge-tag branch)

Just use the proper tags to see the changes that was made in the branch,
without being bothered with what was merged from trunk. I simply do
*not* see why "branch-top" should be holier than "branch-merge-tag"
here. And assuming it isn't, problem is solved.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 13 01:47:03 2004

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