Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 40790:f07d4f94f098 stable
rebase: preserve working copy when redoing in-mem rebase on disk
When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.
Differential Revision: https://phab.mercurial-scm.org/D5356
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 30 Nov 2018 16:21:37 -0800 |
| parents | 8ff910b21eef |
| children | 6f679f25fd4d |
comparison
equal
deleted
inserted
replaced
| 40789:8ff910b21eef | 40790:f07d4f94f098 |
|---|---|
| 420 rebasing 4:e860deea161a "e" | 420 rebasing 4:e860deea161a "e" |
| 421 merging e | 421 merging e |
| 422 transaction abort! | 422 transaction abort! |
| 423 rollback completed | 423 rollback completed |
| 424 hit merge conflicts; re-running rebase without in-memory merge | 424 hit merge conflicts; re-running rebase without in-memory merge |
| 425 rebase aborted | |
| 426 rebasing 2:177f92b77385 "c" | 425 rebasing 2:177f92b77385 "c" |
| 427 rebasing 3:055a42cdd887 "d" | 426 rebasing 3:055a42cdd887 "d" |
| 428 rebasing 4:e860deea161a "e" | 427 rebasing 4:e860deea161a "e" |
| 429 merging e | 428 merging e |
| 430 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 429 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 445 rebasing 4:e860deea161a "e" | 444 rebasing 4:e860deea161a "e" |
| 446 merging e | 445 merging e |
| 447 transaction abort! | 446 transaction abort! |
| 448 rollback completed | 447 rollback completed |
| 449 hit merge conflicts; re-running rebase without in-memory merge | 448 hit merge conflicts; re-running rebase without in-memory merge |
| 450 rebase aborted | 449 abort: uncommitted changes |
| 451 rebasing 2:177f92b77385 "c" | 450 [255] |
| 452 rebasing 3:055a42cdd887 "d" | |
| 453 rebasing 4:e860deea161a "e" | |
| 454 merging e | |
| 455 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
| 456 unresolved conflicts (see hg resolve, then hg rebase --continue) | |
| 457 [1] | |
| 458 BROKEN: working copy change to "a" was lost | |
| 459 $ cat a | 451 $ cat a |
| 460 a | 452 dirty |
| 461 | 453 |
| 462 Retrying without in-memory merge won't lose merge state | 454 Retrying without in-memory merge won't lose merge state |
| 463 $ cd .. | 455 $ cd .. |
| 464 $ hg clone repo3 repo3-merge-state -q | 456 $ hg clone repo3 repo3-merge-state -q |
| 465 $ cd repo3-merge-state | 457 $ cd repo3-merge-state |