tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Jun 2007 20:37:15 +0200
changeset 4729 9881abfc0e44
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Catch illegal boolean values in hgrc nicely. With hg 0.9.3 the section and parameter name wasn't printed, with hg 0.9.4 there was a traceback for ValueError.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update