tests/test-merge8
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 15 Oct 2008 01:14:29 +0200
changeset 7096 6dab29f6df37
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
dirstate._dirs: fix refcounting broken by 7dfac37cfabf reported by Patrick Waugh

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