From f12551699493a191b4501bf10899a184f7f9f73a Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 27 Jan 2012 12:58:35 +0000 Subject: [PATCH] Added missing line svn changeset:22786/svn branch:6.8 --- scripts/merge-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/merge-all.sh b/scripts/merge-all.sh index 74502a0533..6106770d02 100755 --- a/scripts/merge-all.sh +++ b/scripts/merge-all.sh @@ -20,8 +20,8 @@ then fi currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"` - sourceurl="$currentrepowithoutversion/$FROM" +unmerged=`svn mergeinfo --show-revs eligible $sourceurl|sed "s/r//g"` if [ "$unmerged" = "" ] then -- 2.39.5