diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-27 16:26:09 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-27 16:26:09 +0000 |
| commit | f315689eff49ca84e1af75a2005dc28a7477b549 (patch) | |
| tree | 7b2d18db743d40c253f725ed36231eb799df4c33 | |
| parent | 0298d4038185cf2d4113cd3d77f75d48670b6fdd (diff) | |
| download | vaadin-framework-f315689eff49ca84e1af75a2005dc28a7477b549.tar.gz vaadin-framework-f315689eff49ca84e1af75a2005dc28a7477b549.zip | |
Bugfix: concatenate merge commands properly
svn changeset:22804/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 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]..." |