tests/test-issue672
author Sune Foldager <cryo@cyanite.org>
Sun, 07 Feb 2010 15:23:46 +0100
changeset 10379 a78bfaf988e1
parent 8167 6c82beaaa11a
permissions -rwxr-xr-x
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push

#!/bin/sh

# 0-2-4
#  \ \ \
#   1-3-5
#
# rename in #1, content change in #4.

hg init t
cd t

touch 1
touch 2
hg commit -Am init  # 0

hg rename 1 1a
hg commit -m rename # 1

hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 # 2

hg merge --debug 1
hg ci -m merge1 # 3

hg co -C 2
echo hello >> 1
hg ci -m unrelated2 # 4

hg co -C 3
hg merge -y --debug 4

hg co -C 4
hg merge -y --debug 3