diff options
| author | Artur Signell <artur.signell@itmill.com> | 2012-01-27 12:58:35 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2012-01-27 12:58:35 +0000 |
| commit | f12551699493a191b4501bf10899a184f7f9f73a (patch) | |
| tree | d843a24e4afaca461560f785f30113dab652a3b7 | |
| parent | 155a1b9bb98a71041371920d5976cf7ade10ffba (diff) | |
| download | vaadin-framework-f12551699493a191b4501bf10899a184f7f9f73a.tar.gz vaadin-framework-f12551699493a191b4501bf10899a184f7f9f73a.zip | |
Added missing line
svn changeset:22786/svn branch:6.8
| -rwxr-xr-x | scripts/merge-all.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |