tests/test-copy-move-merge
author Mads Kiilerich <mads@kiilerich.com>
Tue, 08 Sep 2009 01:26:15 +0200
changeset 9434 f5ce9b052747
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
test-convert-git: Use ~ instead of ^ Solaris sh interprets ^ as pipe symbol and the test thus failed in strange ways. git can however use of HEAD~ instead of HEAD^.

#!/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