tests/test-double-merge
author Cédric Duval <cedricduval@free.fr>
Sat, 20 Jun 2009 20:57:13 +0200
changeset 8866 87c30fb7e8df
parent 8834 6d36fc70754e
permissions -rwxr-xr-x
help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic.

#!/bin/sh

hg init repo
cd repo

echo line 1 > foo
hg ci -qAm 'add foo' -d "1000000 0"

# copy foo to bar and change both files
hg cp foo bar
echo line 2-1 >> foo
echo line 2-2 >> bar
hg ci -m 'cp foo bar; change both' -d "1000000 0"

# in another branch, change foo in a way that doesn't conflict with
# the other changes
hg up -qC 0
echo line 0 > foo
hg cat foo >> foo
hg ci -m 'change foo' -d "1000000 0"

# we get conflicts that shouldn't be there
hg merge -P
hg merge --debug

echo "-- foo --"
cat foo

echo "-- bar --"
cat bar