Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 3852:629558d09898

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: raise error.InterventionRequired instead of Abort when conflicts error.InterventionRequired is a better error to raise in such cases. Thanks to marmoute for noticing this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 00:16:29 +0530
parents f0096db2a7b1
children d00f0c369bc7 4eb3877540f1
comparison
equal deleted inserted replaced
3851:9ebed1e95ef7 3852:629558d09898
217 $ hg evolve --all 217 $ hg evolve --all
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 abort: fix conflicts and see `hg help evolve.interrupted` 222 fix conflicts and see `hg help evolve.interrupted`
223 [255] 223 [1]
224 224
225 $ echo FOObar > c 225 $ echo FOObar > c
226 $ hg resolve -m 226 $ hg resolve -m
227 (no more unresolved files) 227 (no more unresolved files)
228 continue: hg evolve --continue 228 continue: hg evolve --continue
272 $ hg evolve --all 272 $ hg evolve --all
273 move:[12] foobar to c 273 move:[12] foobar to c
274 atop:[13] foo to c 274 atop:[13] foo to c
275 merging c 275 merging c
276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
277 abort: fix conflicts and see `hg help evolve.interrupted` 277 fix conflicts and see `hg help evolve.interrupted`
278 [255] 278 [1]
279 279
280 $ echo foobar > c 280 $ echo foobar > c
281 $ hg resolve -m 281 $ hg resolve -m
282 (no more unresolved files) 282 (no more unresolved files)
283 continue: hg evolve --continue 283 continue: hg evolve --continue