maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx> writes:

> I got some good progress on this. I re-did the merge using the merge-into bzr
> plugin (advise from bzr developers). This should allow us to merge directly
> from the lp:percona-xtradb tree into lp:maria in the future.

I just tested this, and it seems to work ok.

I was able to merge latest XtraDB with just `bzr merge lp:parcona-xtradb`.
And merging that into latest MariaDB also worked fine with just `bzr merge`.

There were a number of conflicts in the merges. But I think that is only
expected, and unavoidable in fact. Eg. when same problem was fixed in
different ways in the different trees, or changes to InnoDB plugin files
removed in MariaDB tree. Nothing serious, and we can reduce some of this by
cooperating closely between XtraDB and MariaDB (and Sun and Oracle if they are
willing).

 - Kristian.