Bazaar Explorer can't resolve 3 listed conflicts

[Kevin Sherrill]

For full context of my problems you should read:
https://answers.launchpad.net/bzr-windows-installers/+question/135356

There I list trying to uninstall Bazaar 2.1.1 and just use TortoiseSVN with Subversion but TortoiseSVN would no longer work in the context menu even after multiple reinstalls. In an effort to get bazaar to clean up any damage it had caused to my context menu I installed the latest Bazaar 2.2.1 and finally got some version of Tortoise back. Unfortunately, I'm back to going round and round with Bazaar. It's latest trick is to fail out on an Update from an SVN remote repository. All the +N (new) files it added to my working folder it forgets about. On the retry it conflicts with the new files and creates .moved versions. Whether or not you then delete these .moved files, if you open Bazaar Explorer it still says there's conflicts. If I try to resolve them from there by clicking on the red triangle I get the traceback shown below. The conflict window does open but it remains empty. Clicking the Auto-resolve button says there's 0 conflicts.

I'm running Windows 7 x64 Home Premium. I've got Subversion Server 1.6.12, Subversion Client 1.6.13 (both CollabNet) and now Bazaar 2.2.1 install with TortoiseBzr checked in the install options. I'm also running Classic Shell from SourceForge (possibly relevant since it provides shell extentions to the Start Menu and Windows Explorer (no more navigation pane popping!)

bzr: ERROR: exceptions.TypeError: argument 1 of PyQt4.QtCore.QVariant() has an invalid type

Traceback (most recent call last):
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\conflicts.py", line 171, in load
TypeError: argument 1 of PyQt4.QtCore.QVariant() has an invalid type

bzr 2.2.1 on python 2.6.4 (win32)
arguments: ['C:\\Program Files (x86)\\Bazaar\\bzrw.exe', 'qconflicts']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files (x86)\Bazaar\plugins\bzrtools [2.2.0]
  colo C:\Program Files (x86)\Bazaar\plugins\colo [0.1.0]
  explorer C:\Program Files (x86)\Bazaar\plugins\explorer [1.1.1]
  fastimport C:\Program Files (x86)\Bazaar\plugins\fastimport [0.9.0dev]
  launchpad C:\Program Files (x86)\Bazaar\plugins\launchpad [2.2.1]
  loom C:\Program Files (x86)\Bazaar\plugins\loom [2.2.1dev]
  netrc_credential_store C:\Program Files (x86)\Bazaar\plugins\netrc_credential_store [2.2.1]
  news_merge C:\Program Files (x86)\Bazaar\plugins\news_merge [2.2.1]
  pipeline C:\Program Files (x86)\Bazaar\plugins\pipeline [unknown]
  qbzr C:\Program Files (x86)\Bazaar\plugins\qbzr [0.19.2]
  rewrite C:\Program Files (x86)\Bazaar\plugins\rewrite [0.6.1]
  svn C:\Program Files (x86)\Bazaar\plugins\svn [1.0.4]
  upload C:\Program Files (x86)\Bazaar\plugins\upload [1.0.0dev]
  xmloutput C:\Program Files (x86)\Bazaar\plugins\xmloutput [0.8.6]

Example of what the problem looks like in Bazaar Explorer:

 Working tree differs from revision 91.

Conflicts (3) 
Conflict adding file trunk/FlashP/deliverables/htdocs/_release_v1.30_client.swf. Moved existing file to trunk/FlashP/deliverables/htdocs/_release_v1.30_client.swf.moved.
Conflict adding file trunk/FlashP/development/flash/classes/core/assets/InternalBanner.as. Moved existing file to trunk/FlashP/development/flash/classes/core/assets/InternalBanner.as.moved.
Conflict adding file trunk/FlashP/development/flash/classes/core/assets/InternalBasic.as. Moved existing file to trunk/FlashP/development/flash/classes/core/assets/InternalBasic.as.moved.