Paul McCullagh <paul.mccullagh@xxxxxxxxxxxxx> writes:
I am just trying to merge for the second time into mariadb-5.1-pbxt-
merge-new, and get the following:
pmc-2:Repositories/maria/mariadb-5.1-pbxt-merge-new] build% bzr merge
lp:pbxt
M storage/pbxt/src/cache_xt.cc
M storage/pbxt/src/ha_pbxt.cc
M storage/pbxt/src/index_xt.h
M storage/pbxt/src/lock_xt.cc
M storage/pbxt/src/lock_xt.h
M storage/pbxt/src/table_xt.h
/Library/Python/2.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]))
/Library/Python/2.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'
Yes, this looks similar to what I have seen.
If you can repeat it, we should report it to the bzr guys. Hopefully
they can
fix it.
(let me know if you will report it, else I will).
- Kristian.