bzr: ERROR: No final name for trans_id 'new-36'

[Daniel Hahler]

% ./merge-whissip.sh
Merging from remembered submit location bzr+ssh://bazaar.launchpad.net/~vcs-imports/b2evolution/trunk/
+N blogs/rsc/css/jquery/jquery.hintbox.css
[...]
 M tests/classes/simpletest/EvoUnitTestCase.class.php
Text conflict in blogs/inc/_core/_misc.funcs.php
Text conflict in tests/blogs/evocore/misc.funcs.simpletest.php
/usr/lib/python2.6/dist-packages/bzrlib/ui/__init__.py:200: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask(None/None, msg='')
  % (task, self._task_stack[-1]))
/usr/lib/python2.6/dist-packages/bzrlib/ui/__init__.py:200: UserWarning: ProgressTask(2/3, msg='Merge phase') is not the active task ProgressTask(None/None, msg='')
  % (task, self._task_stack[-1]))
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.

[Daniel Hahler (blueyed)]

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)

[John A Meinel (jameinel)]

This may be related to stuff like bug #494269 or bug #504390, but those look to have been fixed in 2.1.0rc1, so if you are using 2.1.1+ the fixes would be present already.

[John A Meinel (jameinel)]

I don't know when/what was fixed, but I just tested with bzr-2.1.2 and bzr.dev and both of them pass (while I can confirm the failure with bzr-2.1.1) So something in the 2.1.2 release fixed this. I don't see anything in NEWS related to this, but 2.1.1 fails, and 2.1.2 succeeds with some conflicts. So *something* was fixed. :)

[John A Meinel (jameinel)]

It looks like this is probably bug #375898 which didn't get a NEWS entry in 2.1.2. (It was merged into 2.0.6, which was then brought into 2.1.1, but the entry wasn't copied. Also note that the bug # in the log messages was incorrectly reported as both bug #373898, and bug #3735898, which are both quite incorrect. bug #375898 is correctly reported in NEWS and in the --fixes entry.)

[Daniel Hahler (blueyed)]

Thank you.

Now, only the PPA needs to get updated.

As far as I can see 2.1.2 has not been released for Debian/Ubuntu via PPA yet, has it?