Mercurial > hg
diff tests/test-merge-revert2 @ 949:d997148155f2
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 |
line wrap: on
line diff
--- a/tests/test-merge-revert2 Wed Aug 17 18:52:27 2005 -0800 +++ b/tests/test-merge-revert2 Thu Aug 18 13:33:39 2005 +0100 @@ -27,7 +27,8 @@ hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert