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

Merge tracking questions

From: Erik Andersson <kirean_at_gmail.com>
Date: Wed, 17 Feb 2010 14:03:54 +0100


I'm looking into moving from svn 1.4.x to svn 1.6.x and migrate from
svnmerge.py merge tracking to core svn merge tracking.

I'm now investigating how to merge feature branches. I'd like to merge a
branch to the trunk and continue work in the branch.

I've found two alternatives
1. merge --reintegrate to trunk, delete branch and recreate the branch. This
does though have the disadvantage of that log --stop-on-copy will stop at
the latest creation of the branch..
2. merge --reintegrate to trunk, block the trunk changeset by --record-only

Now I have some questions:

Could something like a block-option when committing be useful?
Something like:
1. Merge --reintegrate to trunk
2. svn ci -m"merged branch a to trunk" --block ^/branches/a

Can you do --record-only merges remotely? Since it's not changing any other
code then merge properties it would be a nice feature.

Cheers / Erik
Received on 2010-02-17 14:09:15 CET

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

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