Mercurial > evolve

comparison tests/test-evolve-stop-orphan.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 83dc216b9e9a
children f67ac33c07d2
comparison
equal deleted inserted replaced
3795:b8b4ff86feb8 3796:ededd22e7c7b
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 evolve failed! 93 evolve failed!
94 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 94 see `hg help evolve.interrupted-evolve`
95 abort: unresolved merge conflicts (see hg help resolve) 95 abort: unresolved merge conflicts (see hg help resolve)
96 [255] 96 [255]
97 97
98 $ hg evolve --stop 98 $ hg evolve --stop
99 stopped the interrupted evolve 99 stopped the interrupted evolve
137 move:[4] added d 137 move:[4] added d
138 atop:[5] added c 138 atop:[5] added c
139 merging d 139 merging d
140 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 140 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
141 evolve failed! 141 evolve failed!
142 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 142 see `hg help evolve.interrupted-evolve`
143 abort: unresolved merge conflicts (see hg help resolve) 143 abort: unresolved merge conflicts (see hg help resolve)
144 [255] 144 [255]
145 145
146 $ hg diff 146 $ hg diff
147 diff -r cb6a2ab625bb d 147 diff -r cb6a2ab625bb d
186 move:[4] added d 186 move:[4] added d
187 atop:[5] added c 187 atop:[5] added c
188 merging d 188 merging d
189 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 189 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
190 evolve failed! 190 evolve failed!
191 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 191 see `hg help evolve.interrupted-evolve`
192 abort: unresolved merge conflicts (see hg help resolve) 192 abort: unresolved merge conflicts (see hg help resolve)
193 [255] 193 [255]
194 $ echo foo > d 194 $ echo foo > d
195 $ hg resolve -m 195 $ hg resolve -m
196 (no more unresolved files) 196 (no more unresolved files)
239 move:[5] added c 239 move:[5] added c
240 atop:[9] added b 240 atop:[9] added b
241 merging c 241 merging c
242 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 242 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
243 evolve failed! 243 evolve failed!
244 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 244 see `hg help evolve.interrupted-evolve`
245 abort: unresolved merge conflicts (see hg help resolve) 245 abort: unresolved merge conflicts (see hg help resolve)
246 [255] 246 [255]
247 247
248 $ hg status 248 $ hg status
249 M c 249 M c
278 move:[5] added c 278 move:[5] added c
279 atop:[9] added b 279 atop:[9] added b
280 merging c 280 merging c
281 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 281 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
282 evolve failed! 282 evolve failed!
283 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 283 see `hg help evolve.interrupted-evolve`
284 abort: unresolved merge conflicts (see hg help resolve) 284 abort: unresolved merge conflicts (see hg help resolve)
285 [255] 285 [255]
286 286
287 $ echo foobar > c 287 $ echo foobar > c
288 $ hg resolve -m 288 $ hg resolve -m
356 move:[10] added c 356 move:[10] added c
357 atop:[13] added b 357 atop:[13] added b
358 merging c 358 merging c
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
360 evolve failed! 360 evolve failed!
361 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 361 see `hg help evolve.interrupted-evolve`
362 abort: unresolved merge conflicts (see hg help resolve) 362 abort: unresolved merge conflicts (see hg help resolve)
363 [255] 363 [255]
364 364
365 $ hg evolve --stop 365 $ hg evolve --stop
366 stopped the interrupted evolve 366 stopped the interrupted evolve