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

40790:f07d4f94f098

  2 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
  $ hg resolve -l
  U e
BROKEN: these should not say "created no changes to commit"
  $ hg rebase -s 2 -d 7
  rebasing 2:177f92b77385 "c"
  note: rebase of 2:177f92b77385 created no changes to commit
  rebasing 3:055a42cdd887 "d"
  note: rebase of 3:055a42cdd887 created no changes to commit
  rebasing 4:e860deea161a "e"
  note: rebase of 4:e860deea161a created no changes to commit
  saved backup bundle to $TESTTMP/repo1/repo3-merge-state/.hg/strip-backup/177f92b77385-4da7ba9e-rebase.hg
BROKEN: merge state lost
  $ hg resolve -l

==========================
Test for --confirm option|
==========================
  $ cd ..

40791:6f679f25fd4d

  2 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
  $ hg resolve -l
  U e
  $ hg rebase -s 2 -d 7
  rebasing 2:177f92b77385 "c"
  abort: outstanding merge conflicts
  [255]
  $ hg resolve -l
  U e

==========================
Test for --confirm option|
==========================
  $ cd ..