TreeWidget: Crash with unversioned conflicts.

[Craig Hewetson]

I have a test branch with the following status:
modified:
  ooon.txt
  three.txt
unknown:
  .project.moved
  ooon.txt.BASE
  ooon.txt.BASE.moved
  ooon.txt.OTHER
  ooon.txt.OTHER.moved
  ooon.txt.THIS
  ooon.txt.THIS.moved
conflicts:
  Text conflict in ooon.txt
  Conflict adding file ooon.txt.BASE. Moved existing file to ooon.txt.BASE.moved.
  Conflict adding file ooon.txt.OTHER. Moved existing file to ooon.txt.OTHER.moved.
  Conflict adding file ooon.txt.THIS. Moved existing file to ooon.txt.THIS.moved.
pending merge tips: (use -v to see all merge revisions)
  Craig Hewetson 2009-11-08 dasf

When running qrevert on this branch i get the following error in console:
bzr: ERROR: must supply file_id or path
and the following in log file:
0.028 bzr arguments: [u'qrevert']
0.039 looking for plugins in /home/craig/.bazaar/plugins
0.107 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.119 encoding stdout as sys.stdout encoding 'UTF-8'
0.247 opening working tree '/home/craig/projects/test/projB'
0.478 Traceback (most recent call last):
  File "/home/craig/.bazaar/plugins/qbzr/lib/trace.py", line 291, in reports_exception_decorate
    return f(*args, **kargs)
  File "/home/craig/.bazaar/plugins/qbzr/lib/revert.py", line 167, in initial_load
    initial_checked_paths=self.initial_selected_list)
  File "/home/craig/.bazaar/plugins/qbzr/lib/treewidget.py", line 1314, in set_tree
    initial_checked_paths=initial_checked_paths)
  File "/home/craig/.bazaar/plugins/qbzr/lib/treewidget.py", line 421, in set_tree
    kind = self.tree.kind(fileid)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 545, in kind
    relpath = self.id2path(file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 447, in id2path
    entry = self._get_entry(file_id=file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 354, in _get_entry
    raise errors.BzrError('must supply file_id or path')
BzrError: must supply file_id or path

Revison is 1078

[Craig Hewetson (craighewetson-deactivatedaccount)]

If you want the entire branch zipped just ask. Its only 92KB

[Gary van der Merwe (garyvdm)]

I just experienced the same bug.

Work arround: rm *.moved -r (if you are sure that there is nothing in the .moved files that you don't need)