merge.sh now works in directories other than /versions/, like merge-all.sh already...

svn changeset:22842/svn branch:6.8

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 4ee58f0b901e37d6c24e3a0fe8cc1a1df6f2cad0..08b555f8580b507e1d89b72839216c87ef9aab75 100755 (executable)
--- 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