----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Re-merge PBXT into MariaDB with proper history using bzr merge-into CREATION DATE..: Fri, 22 Jan 2010, 10:03 SUPERVISOR.....: Knielsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-BackLog TASK ID........: 76 (http://askmonty.org/worklog/?tid=76) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: PBXT is maintained in its own repository separate from MariaDB (as it is also used for MySQL and Drizzle). Merging new PBXT features into MariaDB is currently a manual process where a copy inside the MariaDB tree is manually patched to match the latest version in the real PBXT repository. This is a pity, as it requires extra work, and the PBXT revision history is not available in the MariaDB tree. Bzr actually has a feature to properly merge one repository into another with preservation of full history and bzr-assisted merging. This is used for merging XtraDB into MariaDB. Some information on this here: http://askmonty.org/wiki/index.php/Merging_into_MariaDB#Merging_from_XtraDB_... We want to do this for PBXT also. However, this is currently blocked on a bug in bzr: bug: https://bugs.launchpad.net/bzr/+bug/375898 Once this bug is resolved, we would want to re-do the inclusion of PBXT into MariaDB, using `bzr merge-into` and following the procedure in the bug report. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)