view tests/test-rename-after-merge @ 6157:09b00faa8670

keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 21 Feb 2008 16:22:31 -0300
parents 784eadabd985
children d821ea464465
line wrap: on
line source

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