Comment 3 for bug 447939

Just saw what appears to be the same error in bzr 2.2.1:

bzr: ERROR: exceptions.IndexError: pop from empty list

Traceback (most recent call last):
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\trace.py", line 300, in reports_exception_decorate
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 235, in initial_load
  File "bzrlib\cleanup.pyo", line 131, in run
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 248, in _initial_load
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 404, in load_diff
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffview.py", line 435, in append_diff
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffview.py", line 384, in insertIxsWithChangesHighlighted
IndexError: pop from empty list

bzr 2.2.1 on python 2.6.4 (win32)
arguments: ['C:\\Program Files\\Bazaar\\tbzrcommand.exe', '--command=log', '--file=C:\\workdir\\foo.cxx']
encoding: 'cp1252', fsenc: 'mbcs', lang: None

Further details:
The file in question had \r\n line endings in a few spots (not everywhere), so I removed the \r's from everywhere in the file. After that, any attempt to diff the version before \r removal with the new version results in this error. Annotate works fine, for what that's worth.