[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bad translation merge
From: |
James |
Subject: |
Re: Bad translation merge |
Date: |
Wed, 7 Mar 2012 13:21:07 +0000 |
David
On 7 March 2012 12:58, David Kastrup <address@hidden> wrote:
> David Kastrup <address@hidden> writes:
>
>> David Kastrup <address@hidden> writes:
>>
>>> Hi, the recent translation merge apparently made some wrong choices when
>>> dealing with merge conflicts. Changes in staging have been overwritten
>>> in the following files:
>>
>>> And that affects a lot more than just translations. I have removed that
>>> commit from origin/staging, and we'll have to investigate what
>>> happened. Francisco, do you remember the commands you used for merging
>>> translation into staging? I'll try repeating this on my own and see
>>> whether I can reproduce this.
>>
>> I can reproduce the problems when merging. It would appear that the
>> history of the translation branch got messed up at some point of time in
>> a manner that git can't recognize how to merge properly anymore.
>>
>> I will try to figure out what happened here. Please don't merge the
>> translation branch to staging while I try figuring this out.
>
> Ok, the shit hit the fan. Apparently I was not fast enough, and
> somebody ran the staging-merge on the bad translation merge. Now master
> is borked.
I won't be home until at least another patchy run (scheduled around
18:00 BST) and perhaps the one at midnight - depending when I get
back.
If it helps Graham (or someone) could disable my account at Savannah
to stop patchy being able to push/merge.
--
--
James
- Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Graham Percival, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Phil Holmes, 2012/03/07
- Re: Bad translation merge, Graham Percival, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
Re: Bad translation merge, Julien Rioux, 2012/03/07