qbrowse: can't open tree with conflicts if conflict file has been deleted

Bug #528548 reported by Alexander Belchenko
14
This bug affects 2 people
Affects Status Importance Assigned to Milestone
QBzr
Status tracked in Trunk
0.18
Fix Released
High
Gary van der Merwe
Trunk
Fix Released
High
Gary van der Merwe

Bug Description

If I had conflict and deleted conflicted file or directory but don't mark it as resolved then when I'm trying to start qbrowse I'm get error message that conflicted file not found and qbrowse immediately closed once I'm closing error dialog. It seems such problem can affect bzr-explorer.

Related branches

tags: added: qbrowse treewidget
Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote :

I've tried to reproduce this so that I cant mark this bug as "confirmed" but when i delete the text conflicted file and run bzr qbrowse I don't get the problem.
BTW: I'm running the latest code

Revision history for this message
Gary van der Merwe (garyvdm) wrote :

Traceback (most recent call last):
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/trace.py", line 291, in reports_exception_decorate
    return f(*args, **kargs)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/commit.py", line 467, in load
    change_load_filter=lambda c:not c.is_ignored())
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/treewidget.py", line 1378, in set_tree
    initial_checked_paths=initial_checked_paths)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/treewidget.py", line 433, in set_tree
    kind = file_kind(self.tree.abspath(path))
  File "/usr/lib/python2.6/dist-packages/bzrlib/osutils.py", line 1982, in file_kind
    raise errors.NoSuchFile(f)
NoSuchFile: No such file: u'/home/garyvdm/qbzr/wd/qbzr/lib/commit.py.BASE.moved'

Revision history for this message
Gary van der Merwe (garyvdm) wrote :

Happens if you have a file that:
* is a conflict
* is not change (Probably not versioned)
* is not on the disk

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.