tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 27 Nov 2006 22:03:31 -0200
changeset 3716 ab5600428b08
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
handle files with both git binary patches and copy/rename ops

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