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

Re: Merging a branch back to trunk

From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: 2006-11-29 11:24:57 CET

Am Mittwoch, 29. November 2006 04:24 schrieb Blair Zajac:

> A little late for this, but you could merge the commits on the branch that
> are original to that branch (and not merges from trunk) back into trunk.
> If you could figure this out (hopefully from log messages indicating of the
> commit was a merge).
>
> You could also do a merge using the branch URL and the trunk URL as the
> diff
>
> cd trunk
> svn merge http://.../branches/mybranch http://.../trunk .
>
> that should make the two identical.
>
> In the future, I would recommend using svnmerge.py and the bidirectional
> merge support to prevent original commits on trunk or branch from being
> merged back onto the original location. It'll save you a ton of grief and
> pain later on. We use it all the time for per-developer or per-feature
> branches, which see merges from trunk and merge back to trunk.
>
> Using svnmerge.py will let it worry about which revisions are available to
> merge into your branches or trunk.

Thanks for your tips. I'll take a look at svnmerge.py.

Greetings
Christoph Bartoschek

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 29 11:26:44 2006

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