No such file error when binary files conflict

[Ian Clatworthy]

Al Budden reported this problem on the mailing list ...

If we have a situation where with a couple of branches:

trunk: r1 -- r2 -- r3 -- r4 -- r5
              \ /
br1: r2 -- r3 -- r4 -/

Every time we merge (in this case to make r5), there will be
conflicts. These will include a file containing an automatically
incremented build number (which is just a text file and hence
relatively easy, if a bit tedious having to do it every time, to
merge) and the binary output file (as well as any normal conflicts).

As an example of the process, we open a (heavyweight) checkout of the
trunk and click "Merge" in Bazaar Explorer. We select br1 on the
server and the changes are pulled in. In the process, there are one
or more text conflicts and the "contents conflict". Out.axf is
deleted and Out.axf.BASE, Out.axf.THIS and Out.axf.OTHER appear.

A message then pops up in Bazaar Explorer saying:

    bzr:ERROR: No such file:
    u'z:/path/to/Out.axf'
    [IGNORE], [CLOSE]

[Ian Clatworthy (ian-clatworthy)]

Looks like a bug in treewidget.py. Here's a sample traceback ...

Traceback (most recent call last):
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 1397, in callable_with_cleanup
    task_callable()
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 1566, in _open_location_task
    self.changed_view()
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 659, in changed_view
    self._wt_browser.set_tree(view.tree, view.branch)
  File "/home/ian/.bazaar/plugins/explorer/lib/wt_browser.py", line 65, in set_tree
    self._browser.set_tree(tree, branch)
  File "/home/ian/.bazaar/plugins/explorer/lib/wt_browser.py", line 469, in set_tree
    self._tree_viewer.set_tree(tree, branch)
  File "/home/ian/.bazaar/plugins/explorer/lib/wt_browser.py", line 691, in set_tree
    treewidget.TreeWidget.set_tree(self, *args)
  File "/home/ian/.bazaar/plugins/qbzr/lib/treewidget.py", line 1385, in set_tree
    initial_checked_paths=initial_checked_paths)
  File "/home/ian/.bazaar/plugins/qbzr/lib/treewidget.py", line 433, in set_tree
    kind = file_kind(self.tree.abspath(path))
  File "/home/ian/Projects/lp/bzr/trunk/bzrlib/osutils.py", line 1984, in file_kind
    raise errors.NoSuchFile(f)
bzrlib.errors.NoSuchFile: No such file: u'/home/ian/Projects/play/yy/f/do.png'