view tests/test-rebase-abort @ 11295:07e425d63dbd

tests: use --debug on test-clone
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 03 Jun 2010 13:58:00 +0200
parents 2313dc4d9817
children 7fa3968004c1
line wrap: on
line source

#!/bin/sh

. $TESTDIR/helpers.sh

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

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 | cleanrebase

echo
echo '% Abort'
hg rebase --abort | cleanrebase

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