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

Explorar el Código

Bugfix: concatenate merge commands properly

svn changeset:22804/svn branch:6.8

tags/7.0.0.alpha2

Johannes Dahlström hace 12 años

padre

0298d40381

commit

f315689eff

Se han modificado 1 ficheros con 1 adiciones y 1 borrados

Dividir vista Mostrar estadísticas de diff

						
							+ 1
							
							- 1
						
scripts/merge-all.shVer fichero
								
			@@ -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]..."