tests/test-copy-move-merge
author Patrick Mezard <pmezard@gmail.com>
Sat, 22 Sep 2007 19:05:36 +0200
changeset 5316 121816063b9a
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
bisect: remove useless try/except

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