[Bug 5139] New: merge state wasn't deleted after a no-op rebase

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Mon Mar 14 19:49:01 EDT 2016


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

            Bug ID: 5139
           Summary: merge state wasn't deleted after a no-op rebase
           Product: Mercurial
           Version: default branch
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: normal
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: gregory.szorc at gmail.com
                CC: mercurial-devel at selenic.com

Using @ (70c2f8a98276) w/ evolve, I was performing a rebase of some very old
changesets. Let's say 3 changesets. All changesets had merge conflicts. I was
using the internal merge tool. After fixing up the merge conflicts, every
single changeset resolved to a no-op change (the diffs were effectively already
applied). So, the rebase was one giant no-op.

At the end of the rebase (after the final `hg rebase --continue`), rebase state
was deleted however the .hg/merge/state file lingered and hg thought I was in
the middle of an incomplete merge.

This feels like a regression. Although I can't say how often I've rebased and
encountered conflicts that resulted in changesets getting discarded because
they were a no-op on rebase. So maybe it is a long outstanding bug.

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


More information about the Mercurial-devel mailing list