tests/test-merge8
author Patrick Mezard <pmezard@gmail.com>
Sun, 09 May 2010 21:45:00 +0200
changeset 11132 321b8b2aa20f
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
convert/svn: list files explicitely, stop checking their type We do not care about directories when looking for recursively added or removed items, and the redundant _checkpath() call is expensive with remote repositories.

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