Mercurial > evolve

comparison tests/test-evolve-stop-orphan.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 828b423545b1
comparison
equal deleted inserted replaced
3851:9ebed1e95ef7 3852:629558d09898
88 $ hg evolve 88 $ hg evolve
89 move:[4] added d 89 move:[4] added d
90 atop:[5] added c 90 atop:[5] added c
91 merging d 91 merging d
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
93 abort: fix conflicts and see `hg help evolve.interrupted` 93 fix conflicts and see `hg help evolve.interrupted`
94 [255] 94 [1]
95 95
96 $ hg evolve --stop 96 $ hg evolve --stop
97 stopped the interrupted evolve 97 stopped the interrupted evolve
98 working directory is now at cb6a2ab625bb 98 working directory is now at cb6a2ab625bb
99 99
134 $ hg next --evolve 134 $ hg next --evolve
135 move:[4] added d 135 move:[4] added d
136 atop:[5] added c 136 atop:[5] added c
137 merging d 137 merging d
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
139 abort: fix conflicts and see `hg help evolve.interrupted` 139 fix conflicts and see `hg help evolve.interrupted`
140 [255] 140 [1]
141 141
142 $ hg diff 142 $ hg diff
143 diff -r cb6a2ab625bb d 143 diff -r cb6a2ab625bb d
144 --- a/d Thu Jan 01 00:00:00 1970 +0000 144 --- a/d Thu Jan 01 00:00:00 1970 +0000
145 +++ b/d Thu Jan 01 00:00:00 1970 +0000 145 +++ b/d Thu Jan 01 00:00:00 1970 +0000
181 $ hg evolve 181 $ hg evolve
182 move:[4] added d 182 move:[4] added d
183 atop:[5] added c 183 atop:[5] added c
184 merging d 184 merging d
185 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 185 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
186 abort: fix conflicts and see `hg help evolve.interrupted` 186 fix conflicts and see `hg help evolve.interrupted`
187 [255] 187 [1]
188 $ echo foo > d 188 $ echo foo > d
189 $ hg resolve -m 189 $ hg resolve -m
190 (no more unresolved files) 190 (no more unresolved files)
191 continue: hg evolve --continue 191 continue: hg evolve --continue
192 $ hg evolve --continue 192 $ hg evolve --continue
232 atop:[8] added a 232 atop:[8] added a
233 move:[5] added c 233 move:[5] added c
234 atop:[9] added b 234 atop:[9] added b
235 merging c 235 merging c
236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
237 abort: fix conflicts and see `hg help evolve.interrupted` 237 fix conflicts and see `hg help evolve.interrupted`
238 [255] 238 [1]
239 239
240 $ hg status 240 $ hg status
241 M c 241 M c
242 A d 242 A d
243 243
269 $ hg evolve --all 269 $ hg evolve --all
270 move:[5] added c 270 move:[5] added c
271 atop:[9] added b 271 atop:[9] added b
272 merging c 272 merging c
273 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 273 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
274 abort: fix conflicts and see `hg help evolve.interrupted` 274 fix conflicts and see `hg help evolve.interrupted`
275 [255] 275 [1]
276 276
277 $ echo foobar > c 277 $ echo foobar > c
278 $ hg resolve -m 278 $ hg resolve -m
279 (no more unresolved files) 279 (no more unresolved files)
280 continue: hg evolve --continue 280 continue: hg evolve --continue
345 atop:[12] added a 345 atop:[12] added a
346 move:[10] added c 346 move:[10] added c
347 atop:[13] added b 347 atop:[13] added b
348 merging c 348 merging c
349 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 349 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
350 abort: fix conflicts and see `hg help evolve.interrupted` 350 fix conflicts and see `hg help evolve.interrupted`
351 [255] 351 [1]
352 352
353 $ hg evolve --stop 353 $ hg evolve --stop
354 stopped the interrupted evolve 354 stopped the interrupted evolve
355 working directory is now at a3f4b95da934 355 working directory is now at a3f4b95da934
356 356