tests/test-conflict
author Patrick Mezard <pmezard@gmail.com>
Mon, 14 Apr 2008 22:31:34 +0200
changeset 6545 a7492fb2107b
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
convert: fix svn branch source detection corner case It was confused by composite-looking revisions made by copy + remove.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status