[Bug 4970] New: Merge fails in extractchoices

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Nov 27 19:54:16 UTC 2015


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

            Bug ID: 4970
           Summary: Merge fails in extractchoices
           Product: Mercurial
           Version: 3.6.1
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: hgbug123 at mailinator.com
                CC: mercurial-devel at selenic.com

Attempting to merge two branches, I am seeing this:

** unknown exception encountered, please report by visiting
** https://mercurial-scm.org/wiki/BugTracker
** Python 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Mercurial Distributed SCM (version 3.6.1)
** Extensions loaded: strip, mq
Traceback (most recent call last):
  File "hg", line 49, in <module>
  File "mercurial\dispatch.pyo", line 54, in run
  File "mercurial\dispatch.pyo", line 116, in dispatch
  File "mercurial\dispatch.pyo", line 187, in _runcatch
  File "mercurial\dispatch.pyo", line 920, in _dispatch
  File "mercurial\dispatch.pyo", line 679, in runcommand
  File "mercurial\dispatch.pyo", line 1051, in _runcommand
  File "mercurial\dispatch.pyo", line 1011, in checkargs
  File "mercurial\dispatch.pyo", line 917, in <lambda>
  File "mercurial\util.pyo", line 801, in check
  File "mercurial\extensions.pyo", line 183, in closure
  File "mercurial\util.pyo", line 801, in check
  File "hgext\mq.pyo", line 3525, in mqcommand
  File "mercurial\util.pyo", line 801, in check
  File "mercurial\commands.pyo", line 4951, in merge
  File "mercurial\hg.pyo", line 656, in merge
  File "mercurial\merge.pyo", line 1267, in update
  File "mercurial\ui.pyo", line 786, in promptchoice
  File "mercurial\ui.pyo", line 773, in extractchoices
ValueError: substring not found

It is 100% reproducible (I am not able to merge these branches at all at the
moment, not sure what I'm going to do!)

Any ideas as to cause/workarounds?

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


More information about the Mercurial-devel mailing list