On Fri, Jun 18, 2010 at 13:25:04 -0700, MARK CALLAGHAN wrote:
> I publish changes from a local MySQL branch at
> I need to merge changes from mysql 5.1.47 and use a command like:
> bzr merge -v -r tag:mysql-5.1.47 /s/bzr/mysql/5.1
> In this case /s/bzr/mysql/5.1 has
> I get lots of conflicts like this:
> Text conflict in sql/slave.cc
> Conflict: can't delete storage/innodb_plugin.moved because it is not
> empty. Not deleting.
> Conflict adding file storage/innodb_plugin. Moved existing file to
> Conflict because storage/innodb_plugin.moved is not versioned, but has
> versioned children. Versioned directory.
Davi's explanation in http://lists.mysql.com/internals/37959 is correct.
What I can add is that this is happening just once. I did not "announce"
it because I did not realize the magnitude of the problems it is going
If I had only realized the amount of problems this import was going to
create only to _me_ to make it to a successful end I wouldn't have
started it at all (I encountered and had to workaround several bugs in
Please notice that people who have edited InnoDB files would have had
conflicts even if I had done the merge in the following way (not
changing bzr file-ids):
0. assume latest bzr and latest svn trees are identical
1. diff the latest bzr tree with the tree from svn r1
3. apply that huuge diff to the latest bzr tree "rewind to svn r1"
4. apply each revision from svn on top of that tree r2, r3, r4...
5. at the end we have the same bzr tree wrt contents, but have the
history from svn imported; bzr's file-ids have not been changed.
So if someone has changed InnoDB files, he would see a conflict when
trying to merge the changeset from step 3. above.
moc.elcaro@stripped Software Developer @ Oracle/Innobase Oy
gro.DSBeerF@dv Committer @ FreeBSD.org
gro.d5v@dv Home @ Sofia, Bulgaria