From f315689eff49ca84e1af75a2005dc28a7477b549 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 27 Jan 2012 16:26:09 +0000 Subject: Bugfix: concatenate merge commands properly svn changeset:22804/svn branch:6.8 --- scripts/merge-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/merge-all.sh b/scripts/merge-all.sh index eda311cc3a..4754186645 100755 --- a/scripts/merge-all.sh +++ b/scripts/merge-all.sh @@ -40,7 +40,7 @@ cmd="" for revision in $unmerged do thiscmd=`dirname $0`"/merge.sh $FROM $revision $AUTOCOMMIT $IGNOREDIRTY" - cmd="$thiscmd && " + cmd="$cmd $thiscmd && " if [ "$AUTOMERGE" = "automerge" ] then echo "Merging [$revision]..." -- cgit v1.2.3