Comment 10 for bug 588698

I looked at the two tips of the merged branches:
<email address hidden>
and <email address hidden> .
The first one indeed has a revision (revno 3009) which removed the storage/innobase directory and added a new storage/innobase directory (converted from SVN). Thus, when doing the merge, any storage/innobase/* file which was modified in the branch of "jonathan.perkin" since the last merge, will conflict with the new file of the "marko.makela" branch.
However, I don't understand why storage/innobase/ha/ha0storage.c gives a "content conflict". I do:
cd mm
bzr missing --theirs -v jp
and I don't see ha0storage.c in the output. Looks to me that it hasn't been modified since the last merge.
If I add --include-merges, I see ha0storage.c in the output, but inside some merge revisions which are said to have been null-merged and should thus not cause a conflict (and that's why I then dropped --include-merges: I wanted to see the actual changes done, not those done and null-merged).
Not a big deal anyway, we are normally not going to find ourselves in such a situation of so big directory changes, anymore.
So we can close this.