tests/test-confused-revert
author Shun-ichi GOTO <shunichi.goto@gmail.com>
Tue, 05 Sep 2006 12:40:45 +0900
changeset 3057 50e0392d51df
parent 2283 e506c14382fd
child 2965 890e285c52a1
permissions -rwxr-xr-x
Fix for Python 2.3 compatibility. Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3 and "cmp" in Python 2.4.

#!/bin/sh

hg init
echo foo > a
hg add a
hg commit -m "1" -d "1000000 0"

echo bar > b
hg add b
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "reverting..."
hg revert

echo "%%% should show b unknown and a back to normal"
hg status

rm b

hg co -C 0
echo foo-a > a
hg commit -m "2a" -d "1000000 0"

hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "1000000 0"

HGMERGE=true hg merge 1

echo "%%% should show foo-b"
cat a

echo bar > b
hg add b
rm a
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "%%% revert should fail"
hg revert

echo "%%% revert should be ok now"
hg revert -r2

echo "%%% should show b unknown and a marked modified (merged)"
hg status

echo "%%% should show foo-b"
cat a