##// END OF EJS Templates
Moving hgweb.py into it's own module in preparation for breaking it up.
Moving hgweb.py into it's own module in preparation for breaking it up.

File last commit:

r2283:e506c143 default
r2311:b832b6eb default
Show More
test-confused-revert
55 lines | 746 B | text/plain | TextLexer
/ tests / test-confused-revert
#!/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