List:Internals« Previous MessageNext Message »
From:Konstantin Osipov Date:June 19 2010 8:35am
Subject:Re: questions about merging the facebook patch to tag:mysql-5.1.47
View as plain text  
* MARK CALLAGHAN <mdcallag@stripped> [10/06/19 01:10]:

Did you make bzr clean-tree --unknown --ignored before the merge?

> 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.  Not deleting.



-- 
Thread
questions about merging the facebook patch to tag:mysql-5.1.47MARK CALLAGHAN18 Jun
  • Re: questions about merging the facebook patch to tag:mysql-5.1.47MARK CALLAGHAN19 Jun
  • Re: questions about merging the facebook patch to tag:mysql-5.1.47Sergei Golubchik19 Jun
    • Re: questions about merging the facebook patch to tag:mysql-5.1.47Konstantin Osipov19 Jun
      • Re: questions about merging the facebook patch to tag:mysql-5.1.47Sergei Golubchik19 Jun
        • Re: questions about merging the facebook patch to tag:mysql-5.1.47Konstantin Osipov19 Jun
          • Re: questions about merging the facebook patch to tag:mysql-5.1.47Sergei Golubchik19 Jun
            • Re: questions about merging the facebook patch to tag:mysql-5.1.47Konstantin Osipov19 Jun
    • Re: questions about merging the facebook patch to tag:mysql-5.1.47MARK CALLAGHAN19 Jun
    • Re: questions about merging the facebook patch to tag:mysql-5.1.47Stewart Smith21 Jun
      • Re: questions about merging the facebook patch to tag:mysql-5.1.47Vasil Dimov21 Jun
        • Re: questions about merging the facebook patch to tag:mysql-5.1.47Stewart Smith22 Jun
  • Re: questions about merging the facebook patch to tag:mysql-5.1.47Konstantin Osipov19 Jun
    • Re: questions about merging the facebook patch to tag:mysql-5.1.47MARK CALLAGHAN19 Jun
      • Re: questions about merging the facebook patch to tag:mysql-5.1.47Konstantin Osipov19 Jun
  • Re: questions about merging the facebook patch to tag:mysql-5.1.47Davi Arnaut19 Jun
    • Re: questions about merging the facebook patch to tag:mysql-5.1.47MARK CALLAGHAN19 Jun
      • Re: questions about merging the facebook patch to tag:mysql-5.1.47Davi Arnaut19 Jun
  • Re: questions about merging the facebook patch to tag:mysql-5.1.47Vasil Dimov21 Jun