[Bug 5981] New: Not all MQ commands are disabled during histedit, qrecord works

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Thu Sep 6 21:02:37 UTC 2018


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

            Bug ID: 5981
           Summary: Not all MQ commands are disabled during histedit,
                    qrecord works
           Product: Mercurial
           Version: 4.7.1
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: histedit
          Assignee: bugzilla at mercurial-scm.org
          Reporter: marcel.svitalsky at gmail.com
                CC: mercurial-devel at mercurial-scm.org

I ran into an unpleasant, deadlock-like situation when I needed to edit some
commits with histedit:
- I chose to edit a particular commit in histedit edit plan
- I wanted to store some part of the changes into a temporary patch (didn't
know then that mq commands throw 'abort' when histedit is in progress), so I
qrecorded those particular changes
- then I wanted to qpop the newly recorded patch and to continue histedit with
the remaining changes, however qpop threw 'abort' because of 'histedit in
progress' and histedit --abort or --continue threw 'abort' because of 'source
has mq patches applied'. The only way out is qfinish-ing the patch.

hg version 4.7.1+7-094d1f42c484

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


More information about the Mercurial-devel mailing list