tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 Jan 2007 22:12:38 +0100
changeset 4015 769be3c57564
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback

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