tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 13 Jun 2007 19:15:58 -0300
changeset 4573 d092e962c4f8
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
localrepo.add: avoid some stats There's still an extra lstat done by dirstate.update.

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