[Bug 3897] New: Unknown Exception during merge
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Apr 19 20:11:54 CDT 2013
http://bz.selenic.com/show_bug.cgi?id=3897
Priority: normal
Bug ID: 3897
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: Unknown Exception during merge
Severity: bug
Classification: Unclassified
OS: Windows
Reporter: ajensen at webmd.net
Hardware: PC
Status: UNCONFIRMED
Version: 2.5.2
Component: Mercurial
Product: Mercurial
I get the following exception [1] when running an internal script which
attempts to do a merge from a release branch into the default branch:
> hg merge v13.1
[1] Exception:
** unknown exception encountered, please report by visiting
** http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
** Mercurial Distributed SCM (version 2.5.2)
** Extensions loaded: rebase, extdiff, purge, mq, progress, share, fetch
Traceback (most recent call last):
File "hg", line 42, in <module>
File "mercurial\dispatch.pyo", line 28, in run
File "mercurial\dispatch.pyo", line 65, in dispatch
File "mercurial\dispatch.pyo", line 88, in _runcatch
File "mercurial\dispatch.pyo", line 743, in _dispatch
File "mercurial\dispatch.pyo", line 514, in runcommand
File "mercurial\dispatch.pyo", line 833, in _runcommand
File "mercurial\dispatch.pyo", line 804, in checkargs
File "mercurial\dispatch.pyo", line 740, in <lambda>
File "mercurial\util.pyo", line 475, in check
File "mercurial\extensions.pyo", line 144, in wrap
File "mercurial\util.pyo", line 475, in check
File "hgext\mq.pyo", line 3508, in mqcommand
File "mercurial\util.pyo", line 475, in check
File "mercurial\commands.pyo", line 4440, in merge
File "mercurial\hg.pyo", line 481, in merge
File "mercurial\merge.pyo", line 630, in update
File "mercurial\merge.pyo", line 391, in applyupdates
File "mercurial\merge.pyo", line 67, in resolve
File "mercurial\merge.pyo", line 57, in __getitem__
KeyError: '.hgsubstate'
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list