TreeWidget: Crash with unversioned conflicts.
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Fix Released
|
Critical
|
Gary van der Merwe |
Bug Description
I have a test branch with the following status:
modified:
ooon.txt
three.txt
unknown:
.project.moved
ooon.txt.BASE
ooon.
ooon.txt.OTHER
ooon.
ooon.txt.THIS
ooon.
conflicts:
Text conflict in ooon.txt
Conflict adding file ooon.txt.BASE. Moved existing file to ooon.txt.
Conflict adding file ooon.txt.OTHER. Moved existing file to ooon.txt.
Conflict adding file ooon.txt.THIS. Moved existing file to ooon.txt.
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/
0.107 looking for plugins in /usr/lib/
0.119 encoding stdout as sys.stdout encoding 'UTF-8'
0.247 opening working tree '/home/
0.478 Traceback (most recent call last):
File "/home/
return f(*args, **kargs)
File "/home/
initial_
File "/home/
initial_
File "/home/
kind = self.tree.
File "/usr/lib/
relpath = self.id2path(
File "/usr/lib/
result = unbound(self, *args, **kwargs)
File "/usr/lib/
entry = self._get_
File "/usr/lib/
raise errors.
BzrError: must supply file_id or path
Revison is 1078
Related branches
Changed in qbzr: | |
assignee: | nobody → Gary van der Merwe (garyvdm) |
milestone: | none → 0.16 |
status: | Confirmed → Fix Released |
If you want the entire branch zipped just ask. Its only 92KB