May I suggest the merge is done by pulling from or otherwise merging from the lp branch that Andrew showed, rather than grabbing the tarball?
I believe it is important to keep all the revision history.
Thanks

bzr merge proposed through launchpad:

https://code.launchpad.net/~andymc73/maria/10.0-oqgraph3-varchar/+merge/196081

Arjen, Andrew, thanks for your request.

We just reviewed oqgraph revisions and here is our plan:

• we will remove Judy from source distribution
• we won't merge OS X fix for configure.cmake
• we will "bzr rebase" your revisions (alternatives: bzr merge or apply tarball as single patch)

Please let us know if you feel any of the above is terribly wrong.

Hi Sergey,

Arjen did mention previously it would be nice to get the development history,
which a rebase, if it applies cleanly, would do (assuming a bzr rebase works
like a git rebase)

Although my personal opinion is might be cleaner to do a bzr merge, maybe the
storage dir then the test suite as separate commits, because I know if I had
git instead of bzr I would have cleaned up the commit history a lot more for
you first.

I know if this was git and I way merging, I would have cleaned up my history
and then done a rebase on top at your end. Not having dealt with bzr a lot
outside of my immediate commit history, I dont know...

Arjen, is the above correct, or did you simply mean the merge linkages?

As for Judy YMMV I havent tested behaviour widely across distributions, and I
dont have access to a recent OSX system

--Andrew

Andrew,

bzr rebase will preserve revision history ad put all your revisions on top of 10.0. The bad thing is that it will also invalidate lp:~andymc73/oqgraph/10.0-oqgraph3-varchar for further merges. If you plan to use this tree for development, it is better to bzr merge, if not (which I believe is the case) bzr rebase is acceptable. Still, it is up to you to choose which way suits your needs best.

As for Judy: if there is absolutely no way to avoid it's inclusion on certain platforms, we'll have to accept it. But for now it is not clear yet.

Pushed to 10.0.7, svoj@mariadb.org-20131211090621-1xvoeglpemhtqwry

Awesome Sergey, thanks for all that work!

Let's see how the MariaDB build farm deals with all this, and then look at what it might bring up.

Thanks Arjen! MariaDB build farm is not capable to deal with it yet due to lack of judy on most platforms. Watch MDEV-5432.