Mercurial > evolve

comparison tests/test-evolve-stop-phasediv.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 25981fae92f9
comparison
equal deleted inserted replaced
3851:9ebed1e95ef7 3852:629558d09898
82 recreate:[6] added d 82 recreate:[6] added d
83 atop:[4] added d 83 atop:[4] added d
84 rebasing to destination parent: ca1b80f7960a 84 rebasing to destination parent: ca1b80f7960a
85 merging c 85 merging c
86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
87 abort: fix conflicts and see `hg help evolve.interrupted` 87 fix conflicts and see `hg help evolve.interrupted`
88 [255] 88 [1]
89 89
90 $ hg evolve --stop 90 $ hg evolve --stop
91 stopped the interrupted evolve 91 stopped the interrupted evolve
92 working directory is now at ca1b80f7960a 92 working directory is now at ca1b80f7960a
93 93