ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

added simple script to port trunk changes into branches

This commit is contained in:
Martin Willi 2006-11-03 14:03:51 +00:00
parent a26e06c75a
commit df85984570
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/merge Executable file
View File

@ -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