Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2 @ 3192:096f1c73cdc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -D/--nodates options to hg diff/export that removes dates from diff headers and replace uses of sed in the tests with --nodates.
author Stephen Darnell <stephen@darnell.plus.com>
date Tue, 26 Sep 2006 00:05:24 +0100
parents 890e285c52a1
children 403ebd4d92d7
comparison
equal deleted inserted replaced
3191:a32f65549b9e 3192:096f1c73cdc3
25 hg status 25 hg status
26 hg id 26 hg id
27 hg update -C 0 27 hg update -C 0
28 echo "changed file1 different" >> file1 28 echo "changed file1 different" >> file1
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 --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
31 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" 31 hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
32 hg status 32 hg status
33 hg id 33 hg id
34 hg revert --no-backup --all 34 hg revert --no-backup --all
35 hg diff 35 hg diff
36 hg status 36 hg status