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

Re: Merge tracking tool for 1.4.x branch

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-03-01 20:24:22 CET

On 3/1/06, Peter Lundblad <peter@famlundblad.se> wrote:
> Blair Zajac writes:
> > I'd like to put on the radar screen that whoever is the release/merge manager
> > for our 1.4.x branch should probably use some merge tracking tool to manage
> > revisions merged from trunk into the branch. I would also like to propose using
> > the svnmerge.py currently located in contrib/client.
> >
>
> What are the benefits of using a merge tracking tool on a release
> branch? The most common operation on a release branch is to pick one
> or a few revision and merge them and be done with it. I thought merge
> tracking was more useful on feature branches and similar, but please
> enlighten me! :-)

I was actually thinking the same thing. The only benefit I can see is
avoiding the possibility of someone accidentally trying to merge a
change twice, but we already track that in the STATUS file, so it
seems unlikely.

I can see the advantage for a feature branch, but it seems less useful
for release branches.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 1 20:30:07 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.