From df85984570323ff0393c8151aa702df25208befb Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Fri, 3 Nov 2006 14:03:51 +0000
Subject: [PATCH] added simple script to port trunk changes into branches

---
 scripts/merge | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 scripts/merge

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