Comment 7 for bug 375898

We are hitting the same issue.
We have a branch of InnoDB code (call it "innodb"; InnoDB is a
sub-module of MySQL); we have merged this branch into a MySQL branch
(call it "mysql"), preserving the important history of the "innodb"
branch, we did it this way:

cd mysql
bzr merge ../innodb
# put the sub-module at its place in the tree:
for each directory merged from ../innodb do
   bzr mv directory storage/innodb/directory
bzr commit

It worked fine. Since then there has been new changes in the "innodb"
branch, and we want to merge them into the "mysql" branch:
cd mysql
bzr merge ../innodb
and we get this error:

+N storage/innobase/mysql-test/innodb_bug47621.result
+N storage/innobase/mysql-test/innodb_bug47621.test
 M storage/innobase/handler/ha_innodb.cc
 M storage/innobase/mysql-test/innodb_bug21704.result
 M storage/innobase/mysql-test/innodb_bug38231.test
 M storage/innobase/plug.in
 M storage/innobase/row/row0sel.c
 /usr/local/lib/python2.6/site-packages/bzrlib/ui/__init__.py:188: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask(None/None, msg='')
  % (task, self._task_stack[-1]))
 /usr/local/lib/python2.6/site-packages/bzrlib/ui/__init__.py:188: 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-1'
file-id: None
root trans-id: 'new-0'

bzr --version
Bazaar (bzr) 2.1.0
  Python interpreter: /usr/local/bin/python2.6 2.6.4
(same with 2.2.0dev1).

which is the same error as in the present bug report 375898.

This is blocking progress of a developer, please help us.

"bzr info -v" in branch "mysql":
Format:
       control: Meta directory format 1
  working tree: Working tree format 6
        branch: Branch format 6
    repository: Packs 6 (uses btree indexes, requires bzr 1.9)
In the working tree:
      8681 unchanged
         0 modified
         0 added
         0 removed
         0 renamed
         0 unknown
         0 ignored
       406 versioned subdirectories
Branch history:
      3372 revisions
      1600 days old
   first revision: Thu 2005-10-27 07:02:45 +0000
  latest revision: Mon 2010-03-08 18:16:41 +0200
Repository:
     60965 revisions

"bzr info -v" in the shared repository containing the branch:
Shared repository with trees (format: 1.14)
Location:
  shared repository: .
Format:
       control: Meta directory format 1
    repository: Packs 6 (uses btree indexes, requires bzr 1.9)
Create working tree for new branches inside the repository.
Repository:
     60965 revisions