tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 15 Oct 2006 21:09:56 +0200
changeset 3399 5dbb3a991bbf
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Catch python2.3's IndexError with bogus http proxy settings. (issue203)

#!/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