Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-narrow-shallow-merges.t
branchstable
changeset 50725 7e5be4a7cda7
parent 49012 5b65721a75eb 
--- a/tests/test-narrow-shallow-merges.t	Mon Jun 26 11:15:30 2023 +0100
+++ b/tests/test-narrow-shallow-merges.t	Mon Jun 26 14:34:58 2023 +0200
@@ -55,7 +55,7 @@
 
   $ hg update -r 'desc("outside 4a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)'
+  $ hg merge -r 'desc("outside 4b")' 2>&1 | grep -E -v '(warning:|incomplete!)'
   merging outside/f
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -67,7 +67,7 @@
   $ echo 6 > outside/f
   $ hg commit -Aqm 'outside 6'
 
-  $ hg merge -r 'desc("outside 4c")' 2>&1 | egrep -v '(warning:|incomplete!)'
+  $ hg merge -r 'desc("outside 4c")' 2>&1 | grep -E -v '(warning:|incomplete!)'
   merging outside/f
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -79,7 +79,7 @@
   $ echo 8 > outside/f
   $ hg commit -Aqm 'outside 8'
 
-  $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)'
+  $ hg merge -r 'desc("outside 4d")' 2>&1 | grep -E -v '(warning:|incomplete!)'
   merging outside/f
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -279,7 +279,7 @@
   $ cd ../pullmaster
   $ hg update -r 'desc("outside 4a")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)'
+  $ hg merge -r 'desc("outside 4b")' 2>&1 | grep -E -v '(warning:|incomplete!)'
   merging inside/f
   merging outside/f
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -293,7 +293,7 @@
 
   $ hg update -r 'desc("outside 4c")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)'
+  $ hg merge -r 'desc("outside 4d")' 2>&1 | grep -E -v '(warning:|incomplete!)'
   merging inside/f
   merging outside/f
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
mercurial