Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 580:4676650f4f9d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-stabilize-conflict.t: yes is not a standard shell utility And for some reason the test fails on OSX.
author Patrick Mezard <patrick@mezard.eu>
date Sat, 13 Oct 2012 16:31:52 +0200
parents 362e65fc6146
children b66b05065dd0
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Wed Oct 10 14:58:21 2012 +0200
+++ b/tests/test-stabilize-conflict.t	Sat Oct 13 16:31:52 2012 +0200
@@ -201,7 +201,9 @@
   $ hg amend
   1 new unstable changesets
   $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH
-  $ yes n 2> ../shutup | HGMERGE=touch hg evolve
+  $ HGMERGE=touch hg evolve <<EOF
+  > n
+  > EOF
   move:[8] babar count up to fifteen
   atop:[10] babar count up to ten
   merging babar