##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix the cat command...
fix the cat command - improve localrepo.walk when passed a node - make the differents walk commands in commands.py accept a node - change commands.cat to walk over a revision - add a test
Matt Mackall - - Load All Authors

File last commit:

r1449:30146be3 default
r1582:63799b01 default
Show More
test-confused-revert
52 lines | 672 B | text/plain | TextLexer
/ tests / test-confused-revert
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo foo > a
hg add a
hg commit -m "1" -d "0 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 "0 0"
hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "0 0"
HGMERGE=true hg update -m 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 "reverting..."
hg revert
echo "%%% should show b unknown and a marked modified (merged)"
hg status
echo "%%% should show foo-b"
cat a