Mercurial > evolve
comparison tests/test-evolve-continue.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 18:09:37 +0400 |
| parents | 1328195f76a9 |
| children | e5bd76f95145 |
comparison
equal
deleted
inserted
replaced
| 6808:c7d3e1d8c6f1 | 6809:9903ee44e658 |
|---|---|
| 68 hit merge conflicts; retrying merge in working copy (inmemory !) | 68 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 69 merging d | 69 merging d |
| 70 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 70 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 71 unresolved merge conflicts | 71 unresolved merge conflicts |
| 72 (see 'hg help evolve.interrupted') | 72 (see 'hg help evolve.interrupted') |
| 73 [240] | 73 [1] |
| 74 | 74 |
| 75 $ echo foo > d | 75 $ echo foo > d |
| 76 $ hg resolve -m | 76 $ hg resolve -m |
| 77 (no more unresolved files) | 77 (no more unresolved files) |
| 78 continue: hg evolve --continue | 78 continue: hg evolve --continue |
| 124 hit merge conflicts; retrying merge in working copy (inmemory !) | 124 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 125 merging c | 125 merging c |
| 126 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 126 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 127 unresolved merge conflicts | 127 unresolved merge conflicts |
| 128 (see 'hg help evolve.interrupted') | 128 (see 'hg help evolve.interrupted') |
| 129 [240] | 129 [1] |
| 130 | 130 |
| 131 $ echo foo > c | 131 $ echo foo > c |
| 132 $ hg resolve -m | 132 $ hg resolve -m |
| 133 (no more unresolved files) | 133 (no more unresolved files) |
| 134 continue: hg evolve --continue | 134 continue: hg evolve --continue |
| 188 hit merge conflicts; retrying merge in working copy (inmemory !) | 188 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 189 merging e | 189 merging e |
| 190 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 190 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 191 unresolved merge conflicts | 191 unresolved merge conflicts |
| 192 (see 'hg help evolve.interrupted') | 192 (see 'hg help evolve.interrupted') |
| 193 [240] | 193 [1] |
| 194 | 194 |
| 195 $ echo bar > e | 195 $ echo bar > e |
| 196 $ hg resolve -m | 196 $ hg resolve -m |
| 197 (no more unresolved files) | 197 (no more unresolved files) |
| 198 continue: hg evolve --continue | 198 continue: hg evolve --continue |
| 230 hit merge conflicts; retrying merge in working copy (inmemory !) | 230 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 231 merging b | 231 merging b |
| 232 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 232 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 233 unresolved merge conflicts | 233 unresolved merge conflicts |
| 234 (see 'hg help evolve.interrupted') | 234 (see 'hg help evolve.interrupted') |
| 235 [240] | 235 [1] |
| 236 | 236 |
| 237 $ echo foo > b | 237 $ echo foo > b |
| 238 $ hg resolve -m | 238 $ hg resolve -m |
| 239 (no more unresolved files) | 239 (no more unresolved files) |
| 240 continue: hg evolve --continue | 240 continue: hg evolve --continue |
| 317 hit merge conflicts; retrying merge in working copy (inmemory !) | 317 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 318 merging f | 318 merging f |
| 319 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 319 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
| 320 unresolved merge conflicts | 320 unresolved merge conflicts |
| 321 (see 'hg help evolve.interrupted') | 321 (see 'hg help evolve.interrupted') |
| 322 [240] | 322 [1] |
| 323 | 323 |
| 324 $ echo foo > f | 324 $ echo foo > f |
| 325 $ hg resolve -m | 325 $ hg resolve -m |
| 326 (no more unresolved files) | 326 (no more unresolved files) |
| 327 continue: hg evolve --continue | 327 continue: hg evolve --continue |
| 334 hit merge conflicts; retrying merge in working copy (inmemory !) | 334 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 335 merging h | 335 merging h |
| 336 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') | 336 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
| 337 unresolved merge conflicts | 337 unresolved merge conflicts |
| 338 (see 'hg help evolve.interrupted') | 338 (see 'hg help evolve.interrupted') |
| 339 [240] | 339 [1] |
| 340 | 340 |
| 341 $ echo foo > h | 341 $ echo foo > h |
| 342 $ hg resolve -m | 342 $ hg resolve -m |
| 343 (no more unresolved files) | 343 (no more unresolved files) |
| 344 continue: hg evolve --continue | 344 continue: hg evolve --continue |
| 383 hit merge conflicts; retrying merge in working copy (inmemory !) | 383 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 384 merging g | 384 merging g |
| 385 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') | 385 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
| 386 unresolved merge conflicts | 386 unresolved merge conflicts |
| 387 (see 'hg help evolve.interrupted') | 387 (see 'hg help evolve.interrupted') |
| 388 [240] | 388 [1] |
| 389 | 389 |
| 390 $ echo foo > g | 390 $ echo foo > g |
| 391 $ hg resolve -m | 391 $ hg resolve -m |
| 392 (no more unresolved files) | 392 (no more unresolved files) |
| 393 continue: hg evolve --continue | 393 continue: hg evolve --continue |
| 434 hit merge conflicts; retrying merge in working copy (inmemory !) | 434 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 435 merging g | 435 merging g |
| 436 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') | 436 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
| 437 unresolved merge conflicts | 437 unresolved merge conflicts |
| 438 (see 'hg help evolve.interrupted') | 438 (see 'hg help evolve.interrupted') |
| 439 [240] | 439 [1] |
| 440 $ echo foo > g | 440 $ echo foo > g |
| 441 $ hg resolve -m | 441 $ hg resolve -m |
| 442 (no more unresolved files) | 442 (no more unresolved files) |
| 443 continue: hg evolve --continue | 443 continue: hg evolve --continue |
| 444 $ hg evolve --continue | 444 $ hg evolve --continue |
| 503 hit merge conflicts; retrying merge in working copy (inmemory !) | 503 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 504 merging c | 504 merging c |
| 505 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 505 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 506 unresolved merge conflicts | 506 unresolved merge conflicts |
| 507 (see 'hg help evolve.interrupted') | 507 (see 'hg help evolve.interrupted') |
| 508 [240] | 508 [1] |
| 509 | 509 |
| 510 Status mentions file 'b' (copied from 'a') here, even though it wasn't | 510 Status mentions file 'b' (copied from 'a') here, even though it wasn't |
| 511 affected by the evolved changeset (nor was 'a') | 511 affected by the evolved changeset (nor was 'a') |
| 512 | 512 |
| 513 $ hg st -C | 513 $ hg st -C |
| 533 1 new orphan changesets | 533 1 new orphan changesets |
| 534 $ hg evolve -q | 534 $ hg evolve -q |
| 535 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 535 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 536 unresolved merge conflicts | 536 unresolved merge conflicts |
| 537 (see 'hg help evolve.interrupted') | 537 (see 'hg help evolve.interrupted') |
| 538 [240] | 538 [1] |
| 539 $ hg st -C | 539 $ hg st -C |
| 540 M a | 540 M a |
| 541 A d | 541 A d |
| 542 c | 542 c |
| 543 R c | 543 R c |