Resolving conflict dialog won't load

[sqwishy]

I had a conflict in which a folder was deleted in the branch being pulled but the local copy had unversioned files so it didn't delete the folder. I clicked on the red triangle/exclamation mark to try and resolve the thing and an error window popped up telling me to report this and provide this traceback stuff.

======

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]

[Nicholas Kazouris (nkazouris)]

I think this is a duplicate of bug #655451 since the fix in bug #650708 (upgrading the Bazaar Explorer plugin to version 1.1.1) doesn't resolve this problem.

Tested with QBzr 0.19.3 and bzrlib 2.2.1