https://bz.mercurial-scm.org/show_bug.cgi?id=5497
Bug ID: 5497 Summary: "IndexError: list index out of range" when attempting to resolve merge conflicts Product: Mercurial Version: 4.1.1 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: richard.ever...@lanternpay.com CC: mercurial-devel@mercurial-scm.org When attempting to resolve a merge conflict (either following an unshelve, or merge from another branch) I get the following error: #!python ** Mercurial version (4.1). TortoiseHg version (4.1) ** Command: --nofork commit ** CWD: C:\src\aces.server ** Encoding: cp1252 ** Extensions loaded: eol, shelve ** Python version: 2.7.10 (default, May 23 2015, 09:44:00) [MSC v.1500 64 bit (AMD64)] ** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='') ** Processor architecture: x64 ** Qt-4.8.7 PyQt-4.11.4 QScintilla-2.9 Traceback (most recent call last): File "tortoisehg\hgqt\status.pyo", line 394, in reloadComplete File "tortoisehg\hgqt\status.pyo", line 424, in updateModel File "mercurial\merge.pyo", line 98, in read File "mercurial\merge.pyo", line 170, in _read IndexError: list index out of range This was also happening in Mercurial 4.0.1. Merging in the same repo and attempting to resolve the same conflicts on a colleague's machine - running Mercurial 3.8.3 does not result in this issue. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel