Bugfix: concatenate merge commands properly · f315689eff - vaadin-framework - source @ dussan.org

Bugfix: concatenate merge commands properly

svn changeset:22804/svn branch:6.8

tags/7.0.0.alpha2

Johannes Dahlström 12 years ago

parent

0298d40381

commit

f315689eff

1 changed files with 1 additions and 1 deletions

Unified View Show Diff Stats

						
							+ 1
							
							- 1
						
scripts/merge-all.shView File
								
														for revision in $unmerged
														
														for revision in $unmerged
													
														do
														
														do
													
															thiscmd=`dirname $0`"/merge.sh $FROM $revision $AUTOCOMMIT $IGNOREDIRTY"
														
															thiscmd=`dirname $0`"/merge.sh $FROM $revision $AUTOCOMMIT $IGNOREDIRTY"
													
															cmd="$thiscmd && "
														
															cmd="$cmd $thiscmd && "
													
															if [ "$AUTOMERGE" = "automerge" ]
														
															if [ "$AUTOMERGE" = "automerge" ]
													
															then
														
															then
													
																echo "Merging [$revision]..."
														
																echo "Merging [$revision]..."