[Bug 5154] New: histedit does not show prompt when conflict resolution is needed

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Wed Mar 23 18:53:05 EDT 2016


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

            Bug ID: 5154
           Summary: histedit does not show prompt when conflict resolution
                    is needed
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: histedit
          Assignee: bugzilla at selenic.com
          Reporter: hg at adamsimpkins.net
                CC: mercurial-devel at selenic.com

Commit 34165875fa5d updated histedit to call repo.ui.pushbuffer()
inside applychange(), before it calls applychanges():
https://www.mercurial-scm.org/repo/hg-all/rev/34165875fa5d


As a result, if there is a merge conflict, and we need to prompt the user for
action, the prompt gets hidden and is never displayed.  We then wait inside
ui.prompt(), but the user has no indication that we are waiting for their
input.

This might not be a problem if we invoke a normal merge-tool, but if there is a
conflict in a symlink we just display a prompt asking what to do:
https://www.mercurial-scm.org/repo/hg-all/file/34165875fa5d/mercurial/filemerge.py#l253

The pushbuffer call means this prompt is never shown.

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


More information about the Mercurial-devel mailing list