Pārlūkot izejas kodu

Bugfix: concatenate merge commands properly

svn changeset:22804/svn branch:6.8
tags/7.0.0.alpha2
Johannes Dahlström pirms 12 gadiem
vecāks
revīzija
f315689eff
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1
    1
      scripts/merge-all.sh

+ 1
- 1
scripts/merge-all.sh Parādīt failu

@@ -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]..."

Notiek ielāde…
Atcelt
Saglabāt