Hello,
What do you think about including patches
global_trx_ids, binlog event checksums and fixes to crash-proof slaves
from https://code.launchpad.net/~jtolmer/mysql-server/global-trx-ids
into tree ?
--
Vadim Tkachenko, CTO
Percona Inc.
ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-34
Paul McCullagh writes:
> I must say I find it strange that bzr is merging files with .OTHER
> and .BASE endings, because these are temp files which only occur after
> a merge conflict.
My thinking is that these were accidentally added at some point in the
history, and subsequently removed. And w
On 13 May 2009, at 01:52, Paul McCullagh wrote:
On May 13, 2009, at 10:37 AM, Kristian Nielsen wrote:
Kristian Nielsen writes:
One thing I might try is to re-do the merge in smaller steps.
There is a _lot_
of add/move/delete/patch the same file in the same changeset, and
it is clear
tha
On May 13, 2009, at 10:37 AM, Kristian Nielsen wrote:
Kristian Nielsen writes:
One thing I might try is to re-do the merge in smaller steps. There
is a _lot_
of add/move/delete/patch the same file in the same changeset, and
it is clear
that it is very hard to get all the special cases of t
Kristian Nielsen writes:
> One thing I might try is to re-do the merge in smaller steps. There is a _lot_
> of add/move/delete/patch the same file in the same changeset, and it is clear
> that it is very hard to get all the special cases of this right in the bzr
> code (I would personally lean to
Paul McCullagh writes:
> Looks like this bug was reported already:
>
> https://bugs.launchpad.net/bzr/+bug/364305
Yes, this looks like the same problem.
> The question is: is this a show stopper for us at the moment?
Yes, I think so. I do not want to merge this and run the risk of a corrupted
6 matches
Mail list logo
