Re: Please stop pushing to the translation branch until further notice

[David Kastrup]

David Kastrup <address@hidden> writes:

> We currently have the situation that bad commits on the translation
> branch have caused a loss of work in our main repository.  While I am
> trying to sort out the damage, it is not helpful if you keep pushing new
> material to the translation branch.  Please refrain from doing so for
> now.  It makes things even harder to fix.
>
> Thanks

The situation should now be under control again.  The translation branch
has been merged with a helper branch that should bring in all the
changes from commits that the merge history suggests to be present.

Please check that

git diff 32b9cd030a1..569714401

(the merge commit resulting in the current translation branch state) is
legit and does not lose any of your work.  This should bring the
translation branch to a state of master located somewhere before
2.15.31.  _After_ (!!!) you have made sure that none of your work has
been lost here, you can merge from origin into the translation branch,
bringing it to a state post 2.15.32.  Just to be on the safe side, I
would prefer doing the merge of the translation branch back to staging
myself next.

Once you have checked that the recent fixes have not caused any of your
work to get lost and the criss-cross merge has been done, you can
continue committing to the translation branch.

I apologize for the inconvenience.

-- 
David Kastrup