maria-developers team mailing list archive

[MARK CALLAGHAN <mdcallag@xxxxxxxxx>]

On Fri, Feb 26, 2010 at 4:19 PM, Sergei Golubchik <serg@xxxxxxxxxxxx> wrote:
> Eh, you omitted lots of crucial details here, but luckily you mentioned
> them in your email to internals, so I was able to decrypt the above :)
>
> Anyway, what happens - you are not merging one mysql branch into
> another. You merge two completely unrelated repositories. And bzr see
> that both the source and the target repositories have the files with the
> name "configure.in" for example - and this is obviously a conflict, as
> two different files have the same name, bzr cannot merge that, it's not
> the same file with the different content, they are two different files.
> Two different file keys, at least.
>
> I seriously doubt that git would handle that situation the way you want.
> By all means, bitkeeper would not - it would not even allow you to pull
> from an unrelated repository, I'm a bit surprised that bzr let you do
> that.
>
> I'm afraid your only option is to replay your changes on a mysql bzr
> branch.

I ended up doing that. Thanks for the advice.

https://code.launchpad.net/~mysqlatfacebook/mysqlatfacebook/5.1

-- 
Mark Callaghan
mdcallag@xxxxxxxxx