[Bug 5822] New: rebase --abort loses commits that didn't need to be rebased

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5822

            Bug ID: 5822
           Summary: rebase --abort loses commits that didn't need to be
                    rebased
           Product: Mercurial
           Version: 4.5.2
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: martinvonz at google.com
                CC: mercurial-devel at mercurial-scm.org

Part of a repro .t file:

  $ hg debugdrawdag <<EOF
  > C
  > |
  > B D  # B/file = B
  > |/   # D/file = D
  > A
  > EOF
  $ hg rebase -r C+D -d B
  rebasing 2:ef8c0fe0897b "D" (D)
  merging file
  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ hg rebase --abort
  saved backup bundle to
$TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg
  rebase aborted


Here C gets lost

-- 
You are receiving this mail because:
You are on the CC list for the bug.