From e5b55ab465af9687524d5ba26a52df5a94600648 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannes.dahlstrom@vaadin.com>
Date: Tue, 31 Jan 2012 12:28:39 +0000
Subject: merge.sh now works in directories other than /versions/, like
 merge-all.sh already does

svn changeset:22842/svn branch:6.8
---
 scripts/merge.sh | 7 +++++--
 1 file 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
-- 
cgit v1.2.3