So I would recommend doing the merge using the merge-into command provided by lp:bzr-merge-into, here are the steps that I did:
<email address hidden>'
<email address hidden>'
bzr branch lp:maria -r revid:$MYSQL_REV maria_base
bzr branch lp:pbxt -r revid:$PBXT_REV pbxt_base
cd maria_base
bzr co
bzr rm storage/pbxt mysql/test/suite/pbxt/{r,t}
bzr commit -m "Remove pbxt in preparation for bring in upstream"
bzr merge-into ../pbxt_base storage/pbxt
bzr mv storage/pbxt/test/mysql-test/t mysql-test/suite/pbxt/t
bzr mv storage/pbxt/test/mysql-test/r mysql-test/suite/pbxt/r
bzr commit -m "Merged pbxt upstream into storage/pbxt and mysql-test/suite/pbxt/{t,r}"
At this point, applying any patches, etc, is up to you.
And doing "bzr merge lp:pbxt" should mostly 'just work'.
If it doesn't, that is definitely a bug.
Also, since you never manually edited any structures, but only ran things via the 'bzr' client, there is obviously a real bug laying around. We shouldn't let you get into a situation where we will crash. If it is a data integrity problem, then we shouldn't have let you generate that.
Now, the fact that you are also *cherrypicking* may be an issue, I'm not really sure.
So I would recommend doing the merge using the merge-into command provided by lp:bzr-merge-into, here are the steps that I did:
<email address hidden>' suite/pbxt/ {r,t} pbxt/test/ mysql-test/ t mysql-test/ suite/pbxt/ t pbxt/test/ mysql-test/ r mysql-test/ suite/pbxt/ r
<email address hidden>'
bzr branch lp:maria -r revid:$MYSQL_REV maria_base
bzr branch lp:pbxt -r revid:$PBXT_REV pbxt_base
cd maria_base
bzr co
bzr rm storage/pbxt mysql/test/
bzr commit -m "Remove pbxt in preparation for bring in upstream"
bzr merge-into ../pbxt_base storage/pbxt
bzr mv storage/
bzr mv storage/
bzr commit -m "Merged pbxt upstream into storage/pbxt and mysql-test/ suite/pbxt/ {t,r}"
At this point, applying any patches, etc, is up to you.
And doing "bzr merge lp:pbxt" should mostly 'just work'.
If it doesn't, that is definitely a bug.
Also, since you never manually edited any structures, but only ran things via the 'bzr' client, there is obviously a real bug laying around. We shouldn't let you get into a situation where we will crash. If it is a data integrity problem, then we shouldn't have let you generate that.
Now, the fact that you are also *cherrypicking* may be an issue, I'm not really sure.