Re: [David Kastrup] [translations] Branches rededicated!

[Jonas Hahnfeld]

Hi David,

it looks like now both branches have master merged and are identical:
 $ git diff origin/dev/translation-merge origin/translation
[empty]
Is that intended?

To me this sounds conceptually wrong, given that you want to use one of
them (I didn't understand which one) for 2.20.1 - I don't think we want
to have the Python 3 switch in there.

Jonas

Am Montag, den 02.03.2020, 23:38 +0100 schrieb David Kastrup:
> I am forwarding a message I sent to the translators list for the
> information of everyone.
> 
> I would like to merge what is now the translation branch into staging
> soon (at the current point of time, this would be a fast-forward but I'd
> probably make it an explicit merge commit).
> 
> Please check whether you think this could interfere with your current
> work or might cause problems.  It is a prerequisite to releasing 2.21.0
> next, something that we should be able to do next without any delay
> apart from getting GUB to compile it.
> 
> Unless something else breaks in the mean time: so if you fear that you
> would be responsible for that, just wait with your next commit and get
> it into 2.21.1 instead.
> 
> Assuming that everyone else is fine with that, we should return to our
> fortnightish development release schedule straight off whatever happens
> to be master.
> 
> The next larger hickup should be the move to a different development
> platform once we figure out where we are good to go.
> 
> All the best!
> 
> David
> 
> -------------------- Start of forwarded message --------------------
> From: David Kastrup <
> address@hidden
> >
> To: 
> address@hidden
> 
> Subject: [translations] Branches rededicated!
> Date: Mon, 02 Mar 2020 23:31:38 +0100
> 
> 
> Hi,
> 
> I've now pushed to the translation branches an update/merge to current
> _master_ (namely what is to be released as 2.21.0).  This version passes
> the basic tests though I haven't merged/pushed it to master yet again.
> 
> If you want to do any outstanding work for what may become 2.20.1 at
> some point of time (an update to stable), please use the branch
> translation-staging for that instead.  It has been kept at a state
> useful for merging into stable/2.20 .
> 
> If you want to do work suitable for _both_, be sure to commit it as a
> separate commit, preferably to translation, so that it may get
> cherry-picked from there (after it has passed muster) into the stable
> branch.
> 
> So in summary:
> 
> translation: work for 2.21
> translation-staging: work for 2.20
> 
> That means in particular that any updates to the changes files for
> 2.18–2.20 should go into translation-staging, and for 2.20–2.22 should
> go into translation.
> 
> And you probably want to clean out the translations of the Changes files
> in translation, making them reflect only stuff that is in the main
> Changes file (because it has been added after the stable/2.20 branch has
> been created).
> 
> All the best, and thanks for all the work that went into 2.20 so far!
> 
> -- 
> David Kastrup
> 
> 
> 
> -------------------- End of forwarded message --------------------
> 
>

signature.asc
Description: This is a digitally signed message part