Comment 2 for bug 375898

Unfortunately, I get the same problem using the bzr merge-into plugin.

$ bzr log --show-ids -r-1
------------------------------------------------------------
revno: 8 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: John Arbash Meinel <email address hidden>
branch nick: merge_into
timestamp: Wed 2008-08-27 20:41:16 -0500
message:
  Merge in the changes from Scott Scriven

The merge goes without errors, but when I then try to merge the next commit from lp:pbxt, I get the error.

Here are exact steps to reproduce from public launchpad trees. It seems the error only occurs after applying our further patches to the merge, so I have attached the necessary patches to the bug. Below commands reproduce the problem for me:

  mkdir tmp-bug375898
  cd tmp-bug375898/
  bzr branch -r'revid:<email address hidden>' lp:pbxt pbxt-base
  bzr branch -r'revid:<email address hidden>' lp:maria mariadb-pbxt-merge
  bzr branch '-rrevid:<email address hidden>' lp:pbxt tmp-pbxt-test-merge-1
  cd mariadb-pbxt-merge/
  bzr co
  bzr rm storage/pbxt mysql-test/suite/pbxt/{r,t}
  bzr commit -m "Remove old pbxt merge in preparation for re-merge with proper history and merge tracking."
  bzr merge-into ../pbxt-base storage/pbxt
  bzr mv storage/pbxt/test/mysql-test/{t,r} mysql-test/suite/pbxt/
  bzr ci -m "Re-merge PBXT into MariaDB with proper history and merge tracking."
  bzr rm `cat ../../bug375898-deletelist.txt`
  patch -p0 -s < ../../bug375898.patch
  bzr ci -m"After-merge fixes for re-merge of PBXT into MariaDB with proper history and merge tracking."
  bzr merge ../tmp-pbxt-test-merge-1

Output from last merge command:

    +N mysql-test/suite/pbxt/r/type_varchar.result.OTHER
    +N mysql-test/suite/pbxt/t/type_varchar.test.OTHER
     M storage/pbxt/src/ha_pbxt.cc
    Contents conflict in mysql-test/suite/pbxt/r/type_varchar.result
    Contents conflict in mysql-test/suite/pbxt/t/type_varchar.test
    /usr/lib/python2.5/site-packages/bzrlib/ui/__init__.py:91: UserWarning: ProgressTask(0/2, msg='Apply phase') is not the active task ProgressTask(None/None, msg='')
      % (task, self._task_stack[-1]))
    /usr/lib/python2.5/site-packages/bzrlib/ui/__init__.py:91: 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'

So while I agree that merge-into is a better solution, it does not seem to solve the original problem :-(