Opening branch with contents conflict fails with traceback
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Explorer |
Fix Released
|
High
|
Ian Clatworthy |
Bug Description
I've tried to open branch after merge. It has several conflicts, some of them are: text conflicts, contents conflicts and conflict adding file without parent. Explorer fails with traceback:
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "C:\work\
File "C:\work\
File "C:\work\
File "C:\work\
File "C:\work\
File "C:\work\
File "C:\work\
File "C:\work\
TypeError: sequence item 2: expected string or Unicode, ContentsConflict found
bzr 1.17 on python 2.5.4 (win32)
arguments: ['bzr', 'explore', '.']
encoding: 'cp1251', fsenc: 'mbcs', lang: None
plugins:
acad C:\work\
bzrtools C:\Program Files\Bazaar\
explorer C:\work\
fastimport C:\work\
launchpad C:\Program Files\Bazaar\
qbzr C:\work\
rebase C:\work\
repoalias C:\work\
scmproj C:\work\
x_bit C:\work\
Related branches
Changed in bzr-explorer: | |
status: | Confirmed → Fix Released |
Should be fixed in rev 223. Please reopen otherwise.