tests/test-copy-move-merge
author Shun-ichi Goto <shunichi.goto@gmail.com>
Wed, 13 Aug 2008 20:18:40 -0500
changeset 6887 304484c7e0ba
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
Update win32mbcs extension * Code cleanup by Matt. * Fix the issue with case-insensitive fs support by wrapping also util.fspath() and util.checkcase() * Abort program when path conversion is failed.

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