tests/test-rename-after-merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 09 Nov 2007 20:21:35 -0200
changeset 5520 cc3af86ab6fe
parent 5318 c6682cdada2f
child 5608 784eadabd985
permissions -rwxr-xr-x
test-convert-darcs: skip if we can't find the elementtree module This patch is a bit dirty to avoid having to repeat the dance required to import elementtree.

#!/bin/sh

# Test issue 746: renaming files brought by the
# second parent of a merge was broken.

echo % create source repository
hg init t
cd t
echo a > a
hg ci -Am a
cd ..

echo % fork source repository
hg clone t t2
cd t2
echo b > b
hg ci -Am b

echo % update source repository
cd ../t
echo a >> a
hg ci -m a2

echo % merge repositories
hg pull ../t2
hg merge

echo % rename b as c
hg mv b c
hg st
echo % rename back c as b
hg mv c b
hg st