tests/test-issue842
author Martijn Pieters <mj@zopatista.com>
Wed, 29 Apr 2009 11:39:49 +0200
changeset 8241 dd1b47e17d7e
parent 6336 4b0c9c674707
child 8452 cb93eee1fbcd
permissions -rwxr-xr-x
Fix typeerror when specifying both --rebase and --pull

hg init test
cd test
echo foo > a
hg ci -Ama

hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb

hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc

hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd