tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 20 Nov 2006 19:32:46 -0200
changeset 3702 70c3ee224c08
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Don't generate git patches that rename a file to multiple destinations With this patch, instead of generating N renames, we'll generate 1 rename and N-1 copies. Ideally the rename should come after the copies instead of before them, but that'd be harder to do.

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