bzr: ERROR: No final name for trans_id 'new-36'
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Unassigned |
Bug Description
% ./merge-whissip.sh
Merging from remembered submit location bzr+ssh:
+N blogs/rsc/
[...]
M tests/classes/
Text conflict in blogs/inc/
Text conflict in tests/blogs/
/usr/lib/
% (task, self._task_
/usr/lib/
% (task, self._task_
bzr: ERROR: No final name for trans_id 'new-36'
file-id: None
root trans-id: 'new-0'
"merge-whissip.sh" is basically "bzr merge" (at least where it fails), and I can reproduce it using "bzr merge" in the bzr repo itself.
Apparently this causes the merge to fail/abort and since it is reproducible, I cannot merge this currently (therefore please consider raising Importance).
I am attaching the relevant part from ~/.bzr.log.
Using bzr 2.1.1-1 on Ubuntu Lucid.
You should be able to reproduce this with:
1. bzr branch lp:b2evolution/whissip
(bzr revno should be 6544)
2. cd whissip
3. bzr merge lp:b2evolution/trunk
(at least I am able to, using a new, non-shared location)