Mercurial > evolve
comparison tests/test-evolve-content-divergent-relocation.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | 03410b04cf10 |
| children | 82da27321e91 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 335 merging y | 335 merging y |
| 336 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 336 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 337 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 337 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 338 unresolved merge conflicts | 338 unresolved merge conflicts |
| 339 (see 'hg help evolve.interrupted') | 339 (see 'hg help evolve.interrupted') |
| 340 [240] | 340 [1] |
| 341 | 341 |
| 342 $ echo watbar > y | 342 $ echo watbar > y |
| 343 $ hg resolve -m | 343 $ hg resolve -m |
| 344 (no more unresolved files) | 344 (no more unresolved files) |
| 345 continue: hg evolve --continue | 345 continue: hg evolve --continue |
| 489 rebasing "divergent" content-divergent changeset f4c3594c72e7 on 26dd4974d99f | 489 rebasing "divergent" content-divergent changeset f4c3594c72e7 on 26dd4974d99f |
| 490 merging y | 490 merging y |
| 491 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 491 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 492 unresolved merge conflicts | 492 unresolved merge conflicts |
| 493 (see 'hg help evolve.interrupted') | 493 (see 'hg help evolve.interrupted') |
| 494 [240] | 494 [1] |
| 495 | 495 |
| 496 $ hg diff | 496 $ hg diff |
| 497 diff -r 26dd4974d99f y | 497 diff -r 26dd4974d99f y |
| 498 --- a/y Thu Jan 01 00:00:00 1970 +0000 | 498 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
| 499 +++ b/y Thu Jan 01 00:00:00 1970 +0000 | 499 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
| 519 merging y | 519 merging y |
| 520 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 520 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 521 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 521 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 522 unresolved merge conflicts | 522 unresolved merge conflicts |
| 523 (see 'hg help evolve.interrupted') | 523 (see 'hg help evolve.interrupted') |
| 524 [240] | 524 [1] |
| 525 | 525 |
| 526 $ hg diff | 526 $ hg diff |
| 527 diff -r 5049972c0e21 y | 527 diff -r 5049972c0e21 y |
| 528 --- a/y Thu Jan 01 00:00:00 1970 +0000 | 528 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
| 529 +++ b/y Thu Jan 01 00:00:00 1970 +0000 | 529 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
| 652 $ echo 0 > b | 652 $ echo 0 > b |
| 653 $ hg ci -Aqm divergent | 653 $ hg ci -Aqm divergent |
| 654 | 654 |
| 655 The first side of the divergence get rebased on top of upstream. | 655 The first side of the divergence get rebased on top of upstream. |
| 656 $ hg rebase -r . -d 'desc("upstream")' | 656 $ hg rebase -r . -d 'desc("upstream")' |
| 657 rebasing 2:898ddd4443b3 tip "divergent" | 657 rebasing 2:898ddd4443b3 "divergent" (tip) |
| 658 $ hg --hidden co 2 -q | 658 $ hg --hidden co 2 -q |
| 659 updated to hidden changeset 898ddd4443b3 | 659 updated to hidden changeset 898ddd4443b3 |
| 660 (hidden revision '898ddd4443b3' was rewritten as: befae6138569) | 660 (hidden revision '898ddd4443b3' was rewritten as: befae6138569) |
| 661 working directory parent is obsolete! (898ddd4443b3) | 661 working directory parent is obsolete! (898ddd4443b3) |
| 662 | 662 |