tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Dec 2006 15:37:10 +0100
changeset 3937 05c703c281ff
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
purge extension doesn't need "#!/usr/bin/env python". (from the Debian package: deb_specific__hgpurge.py.patch)

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