Mercurial > public > mercurial-scm > hg

diff tests/test-up-local-change @ 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 0902ffece4b4
children 52d8d81e72ad
line wrap: on
line diff
--- a/tests/test-up-local-change	Wed Aug 17 18:52:27 2005 -0800
+++ b/tests/test-up-local-change	Thu Aug 18 13:33:39 2005 +0100
@@ -12,8 +12,8 @@
 cd ../r2
 hg up
 echo abc > a
-hg diff > ../d
-sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 cd ../r1
 echo b > b
@@ -28,6 +28,6 @@
 hg --debug up -m
 hg parents
 hg -v history
-hg diff > ../d
-sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"