Mercurial > evolve

comparison tests/test-evolve-continue.t @ 3914:96945ea908df stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 12:52:06 +0200
parents 629558d09898
children d00f0c369bc7 4eb3877540f1
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
56 $ hg evolve --all 56 $ hg evolve --all
57 move:[4] added d 57 move:[4] added d
58 atop:[5] added c 58 atop:[5] added c
59 merging d 59 merging d
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
61 evolve failed! 61 fix conflicts and see `hg help evolve.interrupted`
62 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 62 [1]
63 abort: unresolved merge conflicts (see hg help resolve)
64 [255]
65 63
66 $ echo foo > d 64 $ echo foo > d
67 $ hg resolve -m 65 $ hg resolve -m
68 (no more unresolved files) 66 (no more unresolved files)
69 continue: hg evolve --continue 67 continue: hg evolve --continue
115 $ hg evolve 113 $ hg evolve
116 move:[7] added e 114 move:[7] added e
117 atop:[8] added d 115 atop:[8] added d
118 merging e 116 merging e
119 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') 117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
120 evolve failed! 118 fix conflicts and see `hg help evolve.interrupted`
121 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 119 [1]
122 abort: unresolved merge conflicts (see hg help resolve)
123 [255]
124 120
125 $ echo bar > e 121 $ echo bar > e
126 $ hg resolve -m 122 $ hg resolve -m
127 (no more unresolved files) 123 (no more unresolved files)
128 continue: hg evolve --continue 124 continue: hg evolve --continue
156 $ hg evolve --all 152 $ hg evolve --all
157 move:[2] added b 153 move:[2] added b
158 atop:[9] added a 154 atop:[9] added a
159 merging b 155 merging b
160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 156 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
161 evolve failed! 157 fix conflicts and see `hg help evolve.interrupted`
162 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 158 [1]
163 abort: unresolved merge conflicts (see hg help resolve)
164 [255]
165 159
166 $ echo foo > b 160 $ echo foo > b
167 $ hg resolve -m 161 $ hg resolve -m
168 (no more unresolved files) 162 (no more unresolved files)
169 continue: hg evolve --continue 163 continue: hg evolve --continue
244 atop:[16] added c 238 atop:[16] added c
245 move:[13] added f 239 move:[13] added f
246 atop:[17] added d 240 atop:[17] added d
247 merging f 241 merging f
248 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 242 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
249 evolve failed! 243 fix conflicts and see `hg help evolve.interrupted`
250 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 244 [1]
251 abort: unresolved merge conflicts (see hg help resolve)
252 [255]
253 245
254 $ echo foo > f 246 $ echo foo > f
255 $ hg resolve -m 247 $ hg resolve -m
256 (no more unresolved files) 248 (no more unresolved files)
257 continue: hg evolve --continue 249 continue: hg evolve --continue
261 atop:[18] added f 253 atop:[18] added f
262 move:[15] added h 254 move:[15] added h
263 atop:[19] added g 255 atop:[19] added g
264 merging h 256 merging h
265 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') 257 warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
266 evolve failed! 258 fix conflicts and see `hg help evolve.interrupted`
267 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 259 [1]
268 abort: unresolved merge conflicts (see hg help resolve)
269 [255]
270 260
271 $ echo foo > h 261 $ echo foo > h
272 $ hg resolve -m 262 $ hg resolve -m
273 (no more unresolved files) 263 (no more unresolved files)
274 continue: hg evolve --continue 264 continue: hg evolve --continue
309 move:[19] added g 299 move:[19] added g
310 atop:[21] added f 300 atop:[21] added f
311 perform evolve? [Ny] y 301 perform evolve? [Ny] y
312 merging g 302 merging g
313 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 303 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
314 evolve failed! 304 fix conflicts and see `hg help evolve.interrupted`
315 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 305 [1]
316 abort: unresolved merge conflicts (see hg help resolve)
317 [255]
318 306
319 $ echo foo > g 307 $ echo foo > g
320 $ hg resolve -m 308 $ hg resolve -m
321 (no more unresolved files) 309 (no more unresolved files)
322 continue: hg evolve --continue 310 continue: hg evolve --continue
361 $ hg next --evolve 349 $ hg next --evolve
362 move:[22] added g 350 move:[22] added g
363 atop:[24] added f 351 atop:[24] added f
364 merging g 352 merging g
365 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 353 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
366 evolve failed! 354 fix conflicts and see `hg help evolve.interrupted`
367 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 355 [1]
368 abort: unresolved merge conflicts (see hg help resolve)
369 [255]
370 $ echo foo > g 356 $ echo foo > g
371 $ hg resolve -m 357 $ hg resolve -m
372 (no more unresolved files) 358 (no more unresolved files)
373 continue: hg evolve --continue 359 continue: hg evolve --continue
374 $ hg evolve --continue 360 $ hg evolve --continue