tests/test-copy-move-merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 15 Feb 2008 10:38:37 -0200
changeset 6112 5ffa962783c4
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
cmdutil.commit: use relative paths in the error messages This is more consistent with other error messages and requires less makeup in test-commit and test-symlink-basic.

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