tests/test-merge8
author Brendan Cully <brendan@kublai.com>
Mon, 18 Dec 2006 12:22:43 -0800
changeset 3930 01d98d68d697
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Add revlog.LookupError exception, and use it instead of RevlogError. Remove repo.LookupError, which devolves to the revlog version.

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