tests/test-copy-move-merge
author Patrick Mezard <pmezard@gmail.com>
Fri, 15 Jan 2010 09:50:52 +0100
branchstable
changeset 10249 8ebb34b0f6f7
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
cmdutil: expand style paths (issue1948) Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>

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