Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 3796:ededd22e7c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts The help list various flags which you can use during interrupted evolve resolution and description about what they do. This will be very helpful for user on how to continue an interrupted evolve.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 06 Jun 2018 04:09:49 +0530
parents f6979d64b9fb
children f67ac33c07d2
comparison
equal deleted inserted replaced
3795:b8b4ff86feb8 3796:ededd22e7c7b
218 move:[10] foobar to c 218 move:[10] foobar to c
219 atop:[11] foo to c 219 atop:[11] foo to c
220 merging c 220 merging c
221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
222 evolve failed! 222 evolve failed!
223 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 223 see `hg help evolve.interrupted-evolve`
224 abort: unresolved merge conflicts (see hg help resolve) 224 abort: unresolved merge conflicts (see hg help resolve)
225 [255] 225 [255]
226 226
227 $ echo FOObar > c 227 $ echo FOObar > c
228 $ hg resolve -m 228 $ hg resolve -m
275 move:[12] foobar to c 275 move:[12] foobar to c
276 atop:[13] foo to c 276 atop:[13] foo to c
277 merging c 277 merging c
278 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 278 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
279 evolve failed! 279 evolve failed!
280 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 280 see `hg help evolve.interrupted-evolve`
281 abort: unresolved merge conflicts (see hg help resolve) 281 abort: unresolved merge conflicts (see hg help resolve)
282 [255] 282 [255]
283 283
284 $ echo foobar > c 284 $ echo foobar > c
285 $ hg resolve -m 285 $ hg resolve -m