Merge issue with 4.7.2
Created originally on Bitbucket by Anonymous
#!python ** Mercurial version (4.7+11-cee9043c7dba). TortoiseHg version (4.7.2) ** Command: ** CWD: C:\Program Files\TortoiseHg ** Encoding: cp1252 ** Extensions loaded: tortoisehg.util.configitems ** Python version: 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='') ** Processor architecture: x64 ** Qt-5.9.2 PyQt-5.9.1 QScintilla-2.10.2.dev1711012104 Traceback (most recent call last): File "tortoisehg\hgqt\repomodel.pyo", line 248, in _reloadGraph File "tortoisehg\hgqt\repomodel.pyo", line 265, in _rebuildGraph File "tortoisehg\hgqt\graph.pyo", line 955, in build_nodes File "tortoisehg\hgqt\graph.pyo", line 632, in _iter_graphnodes File "tortoisehg\hgqt\graph.pyo", line 820, in fromchangectx File "tortoisehg\hgqt\thgrepo.pyo", line 1015, in thgmqappliedpatch File "tortoisehg\hgqt\thgrepo.pyo", line 1007, in _thgmqpatchtags File "mercurial\context.pyo", line 517, in tags File "mercurial\localrepo.pyo", line 1038, in nodetags File "mercurial\util.pyo", line 1412, in get File "mercurial\localrepo.pyo", line 960, in _tagscache File "mercurial\localrepo.pyo", line 996, in _findtags File "mercurial\tags.pyo", line 180, in findglobaltags File "mercurial\tags.pyo", line 460, in _readtagcache File "mercurial\tags.pyo", line 476, in _getfnodes File "mercurial\tags.pyo", line 721, in getfnode File "mercurial\context.pyo", line 268, in filenode File "mercurial\context.pyo", line 260, in _fileinfo File "mercurial\manifest.pyo", line 1457, in find File "mercurial\manifest.pyo", line 1427, in read File "mercurial\manifest.pyo", line 373, in init File "mercurial\manifest.pyo", line 126, in init File "mercurial\manifest.pyo", line 148, in findlines ValueError: Manifest lines not in sorted order. Traceback (most recent call last): File "tortoisehg\hgqt\commit.pyo", line 707, in repositoryChanged File "tortoisehg\hgqt\commit.pyo", line 719, in _refreshWorkingState File "tortoisehg\hgqt\commit.pyo", line 742, in refresh File "tortoisehg\hgqt\thgrepo.pyo", line 1015, in thgmqappliedpatch File "tortoisehg\hgqt\thgrepo.pyo", line 1007, in _thgmqpatchtags File "mercurial\context.pyo", line 517, in tags File "mercurial\localrepo.pyo", line 1038, in nodetags File "mercurial\util.pyo", line 1412, in get File "mercurial\localrepo.pyo", line 960, in _tagscache File "mercurial\localrepo.pyo", line 996, in _findtags File "mercurial\tags.pyo", line 180, in findglobaltags File "mercurial\tags.pyo", line 460, in _readtagcache File "mercurial\tags.pyo", line 476, in _getfnodes File "mercurial\tags.pyo", line 721, in getfnode File "mercurial\context.pyo", line 268, in filenode File "mercurial\context.pyo", line 260, in _fileinfo File "mercurial\manifest.pyo", line 1457, in find File "mercurial\manifest.pyo", line 1427, in read File "mercurial\manifest.pyo", line 373, in init File "mercurial\manifest.pyo", line 126, in init File "mercurial\manifest.pyo", line 148, in findlines ValueError: Manifest lines not in sorted order. Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 113, in pageChanged File "tortoisehg\hgqt\merge.pyo", line 679, in currentPage File "tortoisehg\hgqt\csinfo.pyo", line 464, in update File "tortoisehg\hgqt\csinfo.pyo", line 381, in get_markup File "tortoisehg\hgqt\csinfo.pyo", line 330, in get_markup File "tortoisehg\hgqt\csinfo.pyo", line 268, in get_data File "tortoisehg\hgqt\csinfo.pyo", line 200, in preset_func File "tortoisehg\hgqt\thgrepo.pyo", line 1003, in thgtags File "mercurial\context.pyo", line 517, in tags File "mercurial\localrepo.pyo", line 1038, in nodetags File "mercurial\util.pyo", line 1412, in get File "mercurial\localrepo.pyo", line 960, in _tagscache File "mercurial\localrepo.pyo", line 996, in _findtags File "mercurial\tags.pyo", line 180, in findglobaltags File "mercurial\tags.pyo", line 460, in _readtagcache File "mercurial\tags.pyo", line 476, in _getfnodes File "mercurial\tags.pyo", line 721, in getfnode File "mercurial\context.pyo", line 268, in filenode File "mercurial\context.pyo", line 260, in _fileinfo File "mercurial\manifest.pyo", line 1457, in find File "mercurial\manifest.pyo", line 1427, in read File "mercurial\manifest.pyo", line 373, in init File "mercurial\manifest.pyo", line 126, in init File "mercurial\manifest.pyo", line 148, in findlines ValueError: Manifest lines not in sorted order.