qcommit error when trying to commit 1 file of pending merge

[legendarydrew]

This error message pops up as soon as I right-click in a bzr branch directory and select "Bazaar commit":

bzr: ERROR: exceptions.AttributeError: You can't have a initial_selection if tree_model.checkable is not True.

Traceback (most recent call last):
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\trace.py", line 273, in reports_exception_decorate
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\commit.py", line 446, in load
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\treewidget.py", line 1112, in set_tree
AttributeError: You can't have a initial_selection if tree_model.checkable is not True.

bzr 1.18rc1 on python 2.5.4 (win32)
arguments: ['C:\\Program Files\\Bazaar\\bzr.exe', '--command=commit', '--file=C:\\AppServ\\www\\dev\\drewniverse']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [1.18]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [1.18rc1]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store [1.18rc1]
  qbzr C:\Program Files\Bazaar\plugins\qbzr [0.13.1]
  rebase C:\Program Files\Bazaar\plugins\rebase [0.5.3]
  svn C:\Program Files\Bazaar\plugins\svn [0.6.4]

[Alexander Belchenko (bialix)]

I suspect you've tried to commit file or subdir after merge? Is it correct assumption? Try to commit entire tree.

[legendarydrew (headdy)]

Yes, that happens when I've tried to commit just a few files - committing the whole tree works.
However, I wasn't aware that I did a merge. What happened was I did an update from an SVN repository, which resulted in a file conflict.

[Alexander Belchenko (bialix)]

lgendarydrew пишет:
> Yes, that happens when I've tried to commit just a few files - committing the whole tree works.
> However, I wasn't aware that I did a merge. What happened was I did an update from an SVN repository, which resulted in a file conflict.

I suspect you're using checkout (centralized workflow) and on update bzr did implicit merge of your
local changes with upstream. This is most likely happens after one or several local commits.

[Gary van der Merwe (garyvdm)]

We should at least show a nicer error message.