diff options
Diffstat (limited to 'scripts')
| -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 |