]> source.dussan.org Git - vaadin-framework.git/commitdiff
Added missing line
authorArtur Signell <artur.signell@itmill.com>
Fri, 27 Jan 2012 12:58:35 +0000 (12:58 +0000)
committerArtur Signell <artur.signell@itmill.com>
Fri, 27 Jan 2012 12:58:35 +0000 (12:58 +0000)
svn changeset:22786/svn branch:6.8

scripts/merge-all.sh

index 74502a0533176153fecad94d44a336a696acf532..6106770d022af1ce2614f58ffe686d02aaa2d4cd 100755 (executable)
@@ -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