Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sed expression for OS X and Solaris 2.6.
authorLee Cantey <lcantey@gmail.com>
Thu, 13 Jul 2006 11:19:35 -0700
changeset 2610 7a87aebd848e
parent 2609 6c5b1b5cc160
child 2611 1b4eb1f92433
Fix sed expression for OS X and Solaris 2.6. Matches previous fixes in other tests.
tests/test-diff-ignore-whitespace file | annotate | diff | comparison | revisions 
--- a/tests/test-diff-ignore-whitespace	Thu Jul 13 09:40:01 2006 -0700
+++ b/tests/test-diff-ignore-whitespace	Thu Jul 13 11:19:35 2006 -0700
@@ -3,7 +3,8 @@
 # GNU diff is the reference for all of these results.
 
 hgdiff() {
-    hg diff "$@" | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
+    hg diff "$@" | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 }
 
 test_added_blank_lines() {
Mercurial