diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-31 12:28:39 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-31 12:28:39 +0000 |
| commit | e5b55ab465af9687524d5ba26a52df5a94600648 (patch) | |
| tree | ff1cb327e5b51995a1ebfdab8951aa9f6f596f11 | |
| parent | 2c6d780bf04864d06bb0a491b14c7ae5826944a1 (diff) | |
| download | vaadin-framework-e5b55ab465af9687524d5ba26a52df5a94600648.tar.gz vaadin-framework-e5b55ab465af9687524d5ba26a52df5a94600648.zip | |
merge.sh now works in directories other than /versions/, like merge-all.sh already does
svn changeset:22842/svn branch:6.8
| -rwxr-xr-x | scripts/merge.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh index 4ee58f0b90..08b555f858 100755 --- a/scripts/merge.sh +++ b/scripts/merge.sh @@ -18,8 +18,11 @@ 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 +currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"` +sourceurl="$currentrepowithoutversion/$FROM" + +msg=`svn log $sourceurl -r $REVISION --xml|grep "<msg>"|sed "s/<msg>//"|sed "s/<\/msg>//"` +svn merge $sourceurl . -c $REVISION msg="[merge from $FROM] $msg" if [ "$AUTOCOMMIT" = "autocommit" ] then |