tests/test-copy-move-merge
author Brendan Cully <brendan@kublai.com>
Wed, 29 Aug 2007 16:15:23 -0700
changeset 5230 bfd73b567b3d
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
When reverting a file which was renamed, also revert the old name

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c