tests/test-rename-after-merge
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Aug 2008 18:17:11 +0200
changeset 6908 b77c25c2d6c0
parent 5608 784eadabd985
child 7689 d821ea464465
permissions -rwxr-xr-x
Do not sort hgwebdir repositories if python list or tuple is given. This was introduced by changeset f67d1468ac50 (util: add sort helper)

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

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