Mercurial > evolve

comparison 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
comparison
equal deleted inserted replaced
577:2cd2ee20d9fa 580:4676650f4f9d
199 -ten 199 -ten
200 +zehn 200 +zehn
201 $ hg amend 201 $ hg amend
202 1 new unstable changesets 202 1 new unstable changesets
203 $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH 203 $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH
204 $ yes n 2> ../shutup | HGMERGE=touch hg evolve 204 $ HGMERGE=touch hg evolve <<EOF
205 > n
206 > EOF
205 move:[8] babar count up to fifteen 207 move:[8] babar count up to fifteen
206 atop:[10] babar count up to ten 208 atop:[10] babar count up to ten
207 merging babar 209 merging babar
208 output file babar appears unchanged 210 output file babar appears unchanged
209 was merge successful (yn)? merging babar failed! 211 was merge successful (yn)? merging babar failed!