Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 3702:f6979d64b9fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: point to '--abort' in error message The way to escape and evolve run has been updated and we need to tell our user about it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 22 Apr 2018 11:40:17 +0200
parents d166b3dc5e8a
children 19ec729f3ca2 ededd22e7c7b
comparison
equal deleted inserted replaced
3701:29c413a7dfb5 3702:f6979d64b9fb
127 move:[4] babar count up to fifteen 127 move:[4] babar count up to fifteen
128 atop:[5] babar count up to ten 128 atop:[5] babar count up to ten
129 merging babar 129 merging babar
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
131 evolve failed! 131 evolve failed!
132 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort 132 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
133 abort: unresolved merge conflicts (see hg help resolve) 133 abort: unresolved merge conflicts (see hg help resolve)
134 [255] 134 [255]
135 $ hg resolve -l 135 $ hg resolve -l
136 U babar 136 U babar
137 $ hg log -G 137 $ hg log -G
221 merging babar 221 merging babar
222 output file babar appears unchanged 222 output file babar appears unchanged
223 was merge successful (yn)? n 223 was merge successful (yn)? n
224 merging babar failed! 224 merging babar failed!
225 evolve failed! 225 evolve failed!
226 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort 226 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
227 abort: unresolved merge conflicts (see hg help resolve) 227 abort: unresolved merge conflicts (see hg help resolve)
228 [255] 228 [255]
229 $ hg resolve -l 229 $ hg resolve -l
230 U babar 230 U babar
231 $ hg log -G 231 $ hg log -G