##// 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
mpm@selenic.com - - Load All Authors

File last commit:

r839:9c918287 merge default
r1582:63799b01 default
Show More
test-merge-revert
45 lines | 603 B | text/plain | TextLexer
/ tests / test-merge-revert
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
echo "added file1" > file1
echo "added file2" > file2
hg add file1 file2
hg commit -m "added file1 and file2" -d "0 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "0 0" -u user
hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
hg revert
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1" >> file1
HGMERGE=merge hg update
hg diff
hg status
hg id
hg revert
hg diff
hg status
hg id
hg revert -r tip
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id
cd ..; /bin/rm -rf t