"list index out of range" in annotate

Loggerhead trunk, bzr.dev, Python 2.5, Ubuntu 8.04.

The page below errors out with the error below. (Well, it works fine at the moment, since I downgraded my Loggerhead install.)

It started at some point from revision 283 to revision 294 of the trunk. Downgrading back to revision 282 works.

http://bzr.mattnordhoff.com/loggerhead/bzr-svn/trivial/new-style-classes/annotate/1241?file_id=workingtree.py-20060306120941-b083cb0fdd4a69de

2009-03-06 13:53:29,783 DEBUG paste.httpserver.ThreadPool: Added task (0 tasks queued)
2009-03-06 13:53:30,272 INFO loggerhead.new-style-classes: built revision graph cache: 0.22243213653564453 secs
2009-03-06 13:53:31,622 ERROR loggerhead./bzr-svn/trivial/new-style-classes: exceptions.IndexError: list index out of range
Traceback (most recent call last):
  File "loggerhead/apps/error.py", line 31, in __call__
    return self.application(environ, start_response)
  File "/var/lib/python-support/python2.5/paste/httpexceptions.py", line 632, in __call__
    return self.application(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/filesystem.py", line 89, in __call__
    self.folder, self)(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/filesystem.py", line 65, in __call__
    return self.app_for_non_branch(environ)(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/filesystem.py", line 65, in __call__
    return self.app_for_non_branch(environ)(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/filesystem.py", line 65, in __call__
    return self.app_for_non_branch(environ)(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/filesystem.py", line 67, in __call__
    return self.app_for_branch(b)(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/apps/branch.py", line 119, in app
    return c(environ, start_response)
  File "/home/mnordhoff/loggerhead/loggerhead/controllers/__init__.py", line 93, in __call__
    vals.update(self.get_values(path, kwargs, headers))
  File "/home/mnordhoff/loggerhead/loggerhead/controllers/annotate_ui.py", line 137, in get_values
    'contents': list(self.annotate_file(file_id, revid)),
  File "/home/mnordhoff/loggerhead/loggerhead/controllers/annotate_ui.py", line 83, in annotate_file
    change=change, text=hl_lines[lineno - 1])
IndexError: list index out of range
2009-03-06 13:53:31,671 INFO loggerhead./bzr-svn/trivial/new-style-classes: Getting information for ErrorUI: 0.00010204315185546875 secs
2009-03-06 13:53:31,671 INFO wsgi: 127.0.0.1 - - [06/Mar/2009:13:53:29 +0000] "GET /loggerhead/bzr-svn/trivial/new-style-classes/annotate/1241?file_id=workingtree.py-2006030612094
1-b083cb0fdd4a69de HTTP/1.0" 200 - "-" "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
2009-03-06 13:53:31,698 INFO loggerhead./bzr-svn/trivial/new-style-classes: Rendering ErrorUI: 0.016765832901000977 secs, 3012 bytes

(As always, this could possibly have been caused by a bad merge on my part...)