Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2 @ 949:d997148155f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test fixes for Solaris 2.6 Solaris 2.6's stock sed doesn't support alternatives in regular expression. We workaround by breaking up the regexp.
author TK Soh <teekaysoh@yahoo.com>
date Thu, 18 Aug 2005 13:33:39 +0100
parents 01215ad04283
children 52d8d81e72ad
comparison
equal deleted inserted replaced
940:1300271ba8de 949:d997148155f2
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 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
31 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
31 hg status 32 hg status
32 hg id 33 hg id
33 hg revert 34 hg revert
34 hg diff 35 hg diff
35 hg status 36 hg status