tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 20 Mar 2007 22:09:53 -0300
changeset 4254 a7cae4e22749
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Pass normalized directory names to the ignore function This fixes a bad performance regression caused by dd0d9bd91e0a.

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