From: MARK CALLAGHAN Date: June 19 2010 2:11pm Subject: Re: questions about merging the facebook patch to tag:mysql-5.1.47 List-Archive: http://lists.mysql.com/internals/37954 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sat, Jun 19, 2010 at 1:35 AM, Konstantin Osipov wrote: > * MARK CALLAGHAN [10/06/19 01:10]: > > Did you make bzr clean-tree --unknown --ignored before the merge? I don't think that clean tree has anything to do with it. I can reproduce the problem simply by starting with a branch from "-r 3365", changing one line in a file added&deleted in "-r 3366" and then merging in "-r 3366" bzr branch -r tag:mysql-5.1.47 path-to-5.1-branch 5147local bzr branch -r 3365 5147local repro cd repro vi storage/innodb_plugin/data/data0data.c # add one line of text, # storage/innodb_plugin/data0data.c was deleted & added by r3366 bzr commit bzr merge -v -r 3366 ../5147 >& /tmp/r3366 & interesting lines from the output of 'bzr merge' +N storage/innodb_plugin/data/data0data.c RM storage/innodb_plugin/data/data0data.c =3D> storage/innodb_plugin.moved/data/data0data.c.THIS 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 storage/innodb_plugin.moved. Conflict because storage/innodb_plugin.moved is not versioned, but has versioned children. Versioned directory. Conflict: can't delete storage/innodb_plugin.moved/data because it is not empty. Not deleting. Conflict because storage/innodb_plugin.moved/data is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innodb_plugin.moved/data/data0data.c * create branch > >> I publish changes from a local MySQL branch at >> http://launchpad.net/mysqlatfacebook/51 >> >> >> 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 >> bzr+ssh://bazaar.launchpad.net/~mysql/mysql-server/mysql-5.1 >> >> >> >> I have merged without problems to r3365 >> bzr merge -v -r 3365 /s/bzr/mysql/5147 >> >> In this case /s/bzr/mysql/5147 has bzr branch -r tag:mysql-5.1.47 >> /s/bzr/mysql/5.1 5147 >> >> Things go bad at r3366 >> bzr merge -v -r 3365 /s/bzr/mysql/5147 >> >> 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. =A0Not deleting. > > > > -- > --=20 Mark Callaghan mdcallag@stripped