[PATCH] test-conflict: change egrep into grep -E
Patrick Mezard
pmezard at gmail.com
Sat Apr 28 10:02:20 UTC 2007
# HG changeset patch
# User Patrick Mezard <pmezard at gmail.com>
# Date 1177754438 -7200
# Node ID 9ee4f9208caf0ab32634ed6abecae502fa442ee7
# Parent 3e662ccd6d37b68098dac485318f948d328c9449
test-conflict: change egrep into grep -E.
pysh does not support shebangs redirecting to shell calls *with arguments*. Rewriting the command line argument parser is required to do so (instead of using optparse). Right now, it is just easier to change the grep call.
diff -r 3e662ccd6d37 -r 9ee4f9208caf tests/test-conflict
--- a/tests/test-conflict Sat Apr 28 11:53:36 2007 +0200
+++ b/tests/test-conflict Sat Apr 28 12:00:38 2007 +0200
@@ -11,5 +11,5 @@ hg commit -m branch2 -d "1000000 0"
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
-egrep -v ">>>|<<<" a
+grep -E -v ">>>|<<<" a
hg status
More information about the Mercurial-devel
mailing list