Resolving conflict dialog won't load
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
New
|
Undecided
|
Unassigned |
Bug Description
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/
======
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "C:/Program Files (x86)/Bazaar/
TypeError: argument 1 of PyQt4.QtCore.
bzr 2.2.1 on python 2.6.4 (win32)
arguments: ['C:\\Program Files (x86)\\
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
bzrtools C:\Program Files (x86)\Bazaar\
colo C:\Program Files (x86)\Bazaar\
explorer C:\Program Files (x86)\Bazaar\
fastimport C:\Program Files (x86)\Bazaar\
launchpad C:\Program Files (x86)\Bazaar\
loom C:\Program Files (x86)\Bazaar\
netrc_
news_merge C:\Program Files (x86)\Bazaar\
pipeline C:\Program Files (x86)\Bazaar\
qbzr C:\Program Files (x86)\Bazaar\
rewrite C:\Program Files (x86)\Bazaar\
svn C:\Program Files (x86)\Bazaar\
upload C:\Program Files (x86)\Bazaar\
xmloutput C:\Program Files (x86)\Bazaar\
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