Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 40791:6f679f25fd4d stable
rebase: abort in-mem rebase if there's a dirty merge state
In-memory merge uses the on-disk merge state, so we should not allow
it run in-memory merge when the merge state is not clean. We should
probably not use the on-disk merge state when running in-memory merge,
but chaning that is not suitable for the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D5357
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 03 Dec 2018 09:36:40 -0800 |
parents | f07d4f94f098 |
children | e204d9a27528 |
comparison
equal
deleted
inserted
replaced
40790:f07d4f94f098 | 40791:6f679f25fd4d |
---|---|
461 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 461 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
462 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 462 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
463 [1] | 463 [1] |
464 $ hg resolve -l | 464 $ hg resolve -l |
465 U e | 465 U e |
466 BROKEN: these should not say "created no changes to commit" | |
467 $ hg rebase -s 2 -d 7 | 466 $ hg rebase -s 2 -d 7 |
468 rebasing 2:177f92b77385 "c" | 467 rebasing 2:177f92b77385 "c" |
469 note: rebase of 2:177f92b77385 created no changes to commit | 468 abort: outstanding merge conflicts |
470 rebasing 3:055a42cdd887 "d" | 469 [255] |
471 note: rebase of 3:055a42cdd887 created no changes to commit | |
472 rebasing 4:e860deea161a "e" | |
473 note: rebase of 4:e860deea161a created no changes to commit | |
474 saved backup bundle to $TESTTMP/repo1/repo3-merge-state/.hg/strip-backup/177f92b77385-4da7ba9e-rebase.hg | |
475 BROKEN: merge state lost | |
476 $ hg resolve -l | 470 $ hg resolve -l |
471 U e | |
477 | 472 |
478 ========================== | 473 ========================== |
479 Test for --confirm option| | 474 Test for --confirm option| |
480 ========================== | 475 ========================== |
481 $ cd .. | 476 $ cd .. |