tests/test-copy-move-merge
author Wagner Bruna <wbruna@softwareexpress.com.br>
Tue, 25 May 2010 13:20:33 -0300
branchstable
changeset 11244 cff6dfe28f02
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
i18n-pt_BR: added message from 1b8aa9ffa7dc

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