← Back to team overview

maria-developers team mailing list archive

Re: MariaDB + PBXT


Hi Kristian and Stewart,

On May 11, 2009, at 4:24 PM, Kristian Nielsen wrote:

I did a quick test merge of newest PBXT just to check things, and it seems to work well. Most changes automerged. For deleted/renamed/newly added files, a conflict is flagged that must be resolved manually. Changes to files in PBXT that are omitted from the MariaDB source (COPYING, README, etc) also are flagged as a conflict that needs to be resolved. This is to be expected.

I did see some wierd stuff in some testing. Eg. the `bzr diff` of my merge changeset is not empty as expected, rather it shows one diff removing a file and another identical (but reverse) diff adding that file back. I also saw a
strange bzr error message in one case of testing merge. I guess we are
(ab)using some uncommon corners of bzr here, but hopefully any problems/bug in
bzr can be fixed.

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'

The merge was aborted because, after this I have:

[pmc-2:Repositories/maria/mariadb-5.1-pbxt-merge-new] build% bzr diff .
[pmc-2:Repositories/maria/mariadb-5.1-pbxt-merge-new] build%

No diff.

Any ideas?

Paul McCullagh
PrimeBase Technologies

Follow ups