tests/test-issue672
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 02 Jul 2008 12:02:33 +0200
changeset 6796 943f066c0d58
parent 5096 ad6b97132b81
child 8167 6c82beaaa11a
permissions -rwxr-xr-x
Backed out changeset 4879468fa28f (incorrect Content-Length on Windows)

#!/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 -d "0 0"  # 0

hg rename 1 1a
hg commit -m rename -d "0 0" # 1

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

hg merge --debug 1
hg ci -m merge1 -d "0 0" # 3

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

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

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