Mercurial > hg

comparison tests/test-merge-revert2 @ 2982:890e285c52a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: require --all to revert all files.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 21 Aug 2006 09:44:52 -0700
parents d436b21b20dc
children 096f1c73cdc3
comparison
equal deleted inserted replaced
2964:26c8d37496c2 2982:890e285c52a1
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 --no-backup 19 hg revert --no-backup --all
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 --no-backup 34 hg revert --no-backup --all
35 hg diff 35 hg diff
36 hg status 36 hg status
37 hg id 37 hg id
38 hg revert -r tip --no-backup 38 hg revert -r tip --no-backup --all
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