tests/test-merge8
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 28 Dec 2006 01:14:12 +0100
changeset 4010 e282448d68f1
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
inst.reason isn't alway in the form (errno, strerror) urllib2.urlopen("foobar://foo") is an example where inst.reason is a string fix issue383

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