Comments on: Subversion merge tracking with svnmerge

By: Maruthi

Maruthi — Thu, 04 Mar 2010 11:54:29 +0000

Hi Permalink,

You said you have done some research on auto-merging,
How did you do it? how did u handle return values of the merge conflicts
i mean to say, how you would come to know whether merge was successful or failed with conflicts?

By: Clemens W.

Clemens W. — Tue, 09 Oct 2007 10:50:26 +0000

Nice example, however note that you should use the -b (bidirectional) flag for avail and merge in both directions (not just in the intl -> trunk direction as you have it). It works in your example because you only merge once, but as soon as you merge back and forth you’ll need to suppress “reflected” changes.

By: spazdaq

spazdaq — Wed, 19 Sep 2007 18:06:32 +0000

doing research on auto-merging. this was helfpul. thanks.

By: Klaus Dalang

Klaus Dalang — Mon, 04 Dec 2006 01:46:17 +0000

This is indeed a very good full example but what if I have several branches that I need to merge back into the trunk? Do I have to re initialize the trunk for each branch that I need to merge?

By: B. K. Oxley (binkley)

B. K. Oxley (binkley) — Fri, 04 Aug 2006 10:08:50 +0000

How very useful!

I wrapped this very helpful example into a simple shell script (as I am too lazy to type several lines of command):

#!/bin/sh

case $# in
1 ) ;; # branch name
* ) print “usage: $0 new-branch-name”; exit 1 ;;
esac

set -e

svn copy trunk “branches/$1″
svn commit “branches/$1″ -m “Branching trunk to $1.”
(cd trunk;
svnmerge.py init “../branches/$1″
&& svn commit -F svnmerge-commit-message.txt
&& rm svnmerge-commit-message.txt)
(cd “branches/$1″;
svnmerge.py init ../../trunk
&& svn commit -F svnmerge-commit-message.txt
&& rm svnmerge-commit-message.txt)

By: Lowell Alleman

Lowell Alleman — Tue, 16 May 2006 14:36:59 +0000

Very helpful. This is the first “full” svnmerge example that I have found.

Thanks!

- Lowell