Mercurial > hg > pyhgsh

comparison tests/test-merge-revert2 @ 2029:d436b21b20dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93)
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 31 Mar 2006 10:37:25 -0800
parents 7544700fd931
children
comparison
equal deleted inserted replaced
2028:1f1fc418a96c 2029:d436b21b20dc
14 hg id 14 hg id
15 hg update -C 0 15 hg update -C 0
16 hg id 16 hg id
17 echo "changed file1" >> file1 17 echo "changed file1" >> file1
18 hg id 18 hg id
19 hg revert 19 hg revert --no-backup
20 hg diff 20 hg diff
21 hg status 21 hg status
22 hg id 22 hg id
23 hg update 23 hg update
24 hg diff 24 hg diff
29 HGMERGE=merge hg update 29 HGMERGE=merge hg update
30 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ 30 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
31 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" 31 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
32 hg status 32 hg status
33 hg id 33 hg id
34 hg revert 34 hg revert --no-backup
35 hg diff 35 hg diff
36 hg status 36 hg status
37 hg id 37 hg id
38 hg revert -r tip 38 hg revert -r tip --no-backup
39 hg diff 39 hg diff
40 hg status 40 hg status
41 hg id 41 hg id
42 hg update -C 42 hg update -C
43 hg diff 43 hg diff