From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 27 Jan 2012 12:58:35 +0000 (+0000)
Subject: Added missing line
X-Git-Tag: 7.0.0.alpha2~485^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f12551699493a191b4501bf10899a184f7f9f73a;p=vaadin-framework.git

Added missing line

svn changeset:22786/svn branch:6.8
---

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