tests/test-rename-after-merge
author Kostantinos Koukopoulos <kouk@noc.uoa.gr>
Tue, 15 Jan 2008 13:29:59 +0200
changeset 5860 493632bb171c
parent 5608 784eadabd985
child 7689 d821ea464465
permissions -rwxr-xr-x
convert should use default value when CVS_RSH is not set, that value being 'ssh'.

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