diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-31 15:33:01 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-31 15:33:01 +0200 |
| commit | c1f26940cd893dc5e89d2c6eb39d83ce668557fe (patch) | |
| tree | cbe03a6cba732d0bcb1ddce2ece938dd07165489 /scripts/merge.sh | |
| parent | 1d01f9204bd760789592238be039acef57616109 (diff) | |
| parent | b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67 (diff) | |
| download | vaadin-framework-c1f26940cd893dc5e89d2c6eb39d83ce668557fe.tar.gz vaadin-framework-c1f26940cd893dc5e89d2c6eb39d83ce668557fe.zip | |
Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)
Conflicts:
WebContent/release-notes.html
tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
Diffstat (limited to 'scripts/merge.sh')
| -rwxr-xr-x | scripts/merge.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh new file mode 100755 index 0000000000..775bc6a839 --- /dev/null +++ b/scripts/merge.sh @@ -0,0 +1,39 @@ +#!/bin/bash +FROM=$1 +REVISION=$2 +AUTOCOMMIT=$3 + +if [ "$FROM" = "" ] || [ "$REVISION" = "" ] +then + echo "Usage: $0 <from version> <changeset> [autocommit]" + exit 2 +fi + +localchanges=`svn stat|wc -l` +if [ "$localchanges" != "0" ] +then + echo "You must have a clean working space copy" + exit 2 +fi + +svn up + +msg=`svn log http://dev.vaadin.com/svn/versions/$FROM -r $REVISION --xml|grep "<msg>"|sed "s/<msg>//"|sed "s/<\/msg>//"` +svn merge http://dev.vaadin.com/svn/versions/$FROM . -c $REVISION +msg="[merge from $FROM] $msg" +if [ "$AUTOCOMMIT" = "autocommit" ] +then + echo "Trying to commit..." + svn commit -m "$msg" + RET=$? + if [ "$RET" != "0" ] + then + exit 1 + fi + exit 0 +else + echo "Run the following command to commit..." + echo svn commit -m \"$msg\" + exit 1 +fi + |