No such file error with non-text conflicts

[Gareth White]

If you open a working tree containing non-text conflicts in Bazaar Explorer you get a "No such file" error whenever you refresh the window. You also get the same error if you try to revert the merge.

To reproduce:
* Change a file in one branch and remove it in another
* Merge the second branch to the first
* Open the tree in Bazaar Explorer
* It displays the message: "bzr: ERROR: No such file: u'path/to/the/file'"
* Refreshing the window (F5) brings up the error again
* You can ignore it and manually resolve the conflict, but if you try to revert the merge (via the GUI) you get the error again and can't proceed.

Some of the other conflict types give the same behaviour (e.g. conflicts in a binary file, same file renamed to different names).

Tested with Bazaar Explorer 0.11.2, QBzr 0.18, Bazaar 2.1.0rc1, Python 2.5.4 on Windows XP.

[Ian Clatworthy (ian-clatworthy)]

Thanks for the bug report and steps to reproduce. Here's the actual exception (obtained via bzr explorer . -Derror):

Traceback (most recent call last):
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 1348, in callable_with_cleanup
    task_callable()
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 1517, in _open_location_task
    self.changed_view()
  File "/home/ian/.bazaar/plugins/explorer/lib/explorer.py", line 651, in changed_view
    self._wt_browser.set_tree(view.tree, view.branch)
  File "/home/ian/.bazaar/plugins/explorer/lib/wt_browser.py", line 63, in set_tree
    self._browser.set_tree(tree, branch)
  File "/home/ian/.bazaar/plugins/explorer/lib/wt_browser.py", line 452, in set_tree
    self._tree_viewer.set_tree(tree, branch)
  File "/home/ian/.bazaar/plugins/qbzr/lib/treewidget.py", line 1363, in set_tree
    initial_checked_paths=initial_checked_paths)
  File "/home/ian/.bazaar/plugins/qbzr/lib/treewidget.py", line 432, in set_tree
    kind = file_kind(self.tree.abspath(path))
  File "/home/ian/Projects/bzr/bzr/trunk/bzrlib/osutils.py", line 1982, in file_kind
    raise errors.NoSuchFile(f)
bzrlib.errors.NoSuchFile: No such file: u'/home/ian/Projects/scm-play/keywords/aa.txt'

[Ian Clatworthy (ian-clatworthy)]

"bzr qbrowse ." falls over in the same place. It looks like the path in conflict doesn't exist in the tree so we need to handle that. I'm not sure exactly how the InternalItem on line 433 is used later so I'm not confident in my understanding of what to do here.

[Gary van der Merwe (garyvdm)]

This was fix by the fix for Bug 528548.