[Bug 4896] New: Aborting a rebase fails after rebasing multiple changeset on a public changeset

[mercurial-bugs at selenic.com]

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

            Bug ID: 4896
           Summary: Aborting a rebase fails after rebasing multiple
                    changeset on a public changeset
           Product: Mercurial
           Version: 3.5.1
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: cdelahousse at fb.com
                CC: mercurial-devel at selenic.com

Say you have a branch with two draft changesets.  Say you have another branch
with the head being a public changes. Now, you want to rebase your the draft
commits onto the public branch. When you do so, the older commit is such that
it disappears in the merge and the newest commit creates a merge conflict. This
gets your repo into a merge state.

If you try to abort the rebase and not deal with the conflict, you'll get the
following error:

$ hg rebase --abort
warning: can't clean up public changesets eab433d77a2c
rebase aborted

And your repository will still be in a merge state.

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