diff options
| author | Martin Willi <martin@strongswan.org> | 2006-11-03 14:03:51 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-11-03 14:03:51 +0000 |
| commit | df85984570323ff0393c8151aa702df25208befb (patch) | |
| tree | 227df06a5c2fb8fbcd0c6bec33ae37b70480e7a7 /scripts/merge | |
| parent | a26e06c75a384dcdd63c58c9eccc701b56e3c93c (diff) | |
| download | strongswan-df85984570323ff0393c8151aa702df25208befb.tar.bz2 strongswan-df85984570323ff0393c8151aa702df25208befb.tar.xz | |
added simple script to port trunk changes into branches
Diffstat (limited to 'scripts/merge')
| -rwxr-xr-x | scripts/merge | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/scripts/merge b/scripts/merge new file mode 100755 index 000000000..1f11289c8 --- /dev/null +++ b/scripts/merge @@ -0,0 +1,22 @@ +#!/bin/bash + +REPO="svn+ssh://svn.strongswan.org/strongswan" +PORT=`svn propget trunk-rev-backport` +HEAD=`svn info $REPO | grep Revision: | awk '{ print $2 }'` + + +if [ "$1" == "diff" ] +then + echo "showing diff I would merge from trunk revisions $PORT:$HEAD" + svn diff $REPO/trunk -r $PORT:$HEAD +elif [ "$1" == "dry" ] +then + echo "showing files I would merge from trunk revisions $PORT:$HEAD" + svn merge $REPO/trunk -r $PORT:$HEAD --dry-run +elif [ "$1" == "run" ] +then + echo "merging files from trunk revisions $PORT:$HEAD to branch" + svn merge $REPO/trunk -r $PORT:$HEAD && svn propset trunk-rev-backport $HEAD . +else + echo "Usage: $0 diff|dry|run" +fi |