view tests/test-rebase-abort @ 9899:be574a37a8ae stable

run-tests: give each child its own tmp dir (issue1911)

Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories.  Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH

cleanoutput () {
    sed -e 's/\(Rebase status stored to\).*/\1/'  \
        -e 's/\(Rebase status restored from\).*/\1/' \
        -e 's/\(saving bundle to \).*/\1/'
}

hg init a
cd a
echo 'c1' >common
hg add common
hg commit -d '0 0' -m "C1"

echo 'c2' >>common
hg commit -d '1 0' -m "C2"

echo 'c3' >>common
hg commit -d '2 0' -m "C3"

hg update -C 1
echo 'l1' >>extra
hg add extra
hg commit -d '3 0' -m "L1"

sed -e 's/c2/l2/' common > common.new
mv common.new common
hg commit -d '4 0' -m "L2"

hg glog  --template '{rev}: {desc}\n'

echo
echo '% Conflicting rebase'
hg rebase -s 3 -d 2 2>&1 | cleanoutput

echo
echo '% Abort'
hg rebase --abort 2>&1 | cleanoutput

hg glog  --template '{rev}: {desc}\n'