blob: 1f11289c8776610ca7436b8068da2a361b3aa2bd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
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
|
