On 6/18/10 5:25 PM, MARK CALLAGHAN wrote:
> Why was that done?
> Does that mean that people like me who maintain our own trees and want
> to merge now have a lot more work to do?
Yes. Everybody (including us) will have more work to do, but it's only
once. The reason, AFAIU, is that InnoDB used to maintain their code in a
svn tree with a different layout. This tree got "converted" to a bzr one
in a manner that svn history wouldn't be lost and this tree was merged
to 5.1. Long story short, they encountered several problems in bzr and
the consequence is that the old innodb_plugin in 5.1 got sacked.
Guilhem or Vasil might shed more light on the specific problems.
The bad news is that *everyone* who merges to/from a 5.1 tree is going
to encounter those conflicts and will need to deal with it. The good
news is that innodb_plugin now has its original (more old and detailed)
history and InnoDB will be merging "directly" to the main trees from now
own -- no more snapshots.
In trunk now there is only a single innobase directory with the full
history (going back to 2005 from what i can see).