https://bz.mercurial-scm.org/show_bug.cgi?id=5595
Bug ID: 5595 Summary: AssertionError: computed line range for ... is not consistent between ancestor branches in context.blockdescendants() Product: Mercurial Version: default branch Hardware: All URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1372855 OS: All Status: UNCONFIRMED Severity: bug Priority: normal Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: gregory.sz...@gmail.com CC: mercurial-devel@mercurial-scm.org Originally reported at https://bugzilla.mozilla.org/show_bug.cgi?id=1372855. $ hg clone -U https://hg.mozilla.org/mozilla-central $ cd mozilla-central $ hg log -r 'followlines("browser/base/content/browser.xul", 288:296, startrev=c5bf02a74f6a, descend=true)' AssertionError: computed line range for browser/base/content/browser.xul@a9d0ef8b4113 is not consistent between ancestor branches ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)] ** Mercurial Distributed SCM (version 4.2.1+668-6675d23da748) ** Extensions loaded: Traceback (most recent call last): File "/Users/gps/lib/python/mercurial/commandserver.py", line 369, in _serverequest sv.serve() File "/Users/gps/lib/python/mercurial/commandserver.py", line 293, in serve while self.serveone(): File "/Users/gps/lib/python/mercurial/commandserver.py", line 268, in serveone handler(self) File "/Users/gps/lib/python/mercurial/chgserver.py", line 439, in runcommand return super(chgcmdserver, self).runcommand() File "/Users/gps/lib/python/mercurial/commandserver.py", line 251, in runcommand ret = (dispatch.dispatch(req) or 0) & 255 # might return None File "/Users/gps/lib/python/mercurial/dispatch.py", line 167, in dispatch ret = _runcatch(req) File "/Users/gps/lib/python/mercurial/dispatch.py", line 307, in _runcatch return _callcatch(ui, _runcatchfunc) File "/Users/gps/lib/python/mercurial/dispatch.py", line 315, in _callcatch return scmutil.callcatch(ui, func) File "/Users/gps/lib/python/mercurial/scmutil.py", line 145, in callcatch return func() File "/Users/gps/lib/python/mercurial/dispatch.py", line 297, in _runcatchfunc return _dispatch(req) File "/Users/gps/lib/python/mercurial/dispatch.py", line 927, in _dispatch cmdpats, cmdoptions) File "/Users/gps/lib/python/mercurial/dispatch.py", line 663, in runcommand ret = _runcommand(ui, options, cmd, d) File "/Users/gps/lib/python/mercurial/dispatch.py", line 935, in _runcommand return cmdfunc() File "/Users/gps/lib/python/mercurial/dispatch.py", line 924, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/Users/gps/lib/python/mercurial/util.py", line 1064, in check return func(*args, **kwargs) File "/Users/gps/lib/python/mercurial/commands.py", line 3455, in log for rev in revs: File "/Users/gps/lib/python/mercurial/smartset.py", line 839, in gen yield _next(nextgen) File "/Users/gps/lib/python/mercurial/smartset.py", line 846, in _consumegen for item in self._gen: File "/Users/gps/lib/python/mercurial/revset.py", line 992, in <genexpr> (c.rev() for c, _linerange File "/Users/gps/lib/python/mercurial/context.py", line 1353, in blockdescendants 'ancestor branches' % c) AssertionError: computed line range for browser/base/content/browser.xul@a9d0ef8b4113 is not consistent between ancestor branches -- 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