[COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

16.03.2019 14:07 TAMUKI Shoichi <tamuki@linet.gr.jp> wrote:
> 
> Hello Rafal-san,
> 
> From: Rafal Luzynski <digitalfreak@lingonborough.com>
> Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from
> 2 to 1 [BZ #24162]
> Date: Fri, 15 Mar 2019 08:56:25 +0100 (CET)
> 
> > Do you consider backporting this patch to 2.29?  Do you need an
> > assistance or do you need someone to backport this for you?
> > No problem if you don't want this to be backported.
> > 
> > See also: https://sourceware.org/ml/libc-alpha/2019-02/msg00558.html
> 
> Yes, I remember the work remaining to backport this patch to 2.29.

OK, nice.

> > [...]
> > Please see how other backported patches look and format yours the same.
> > Hint 1: use "git cherry-pick -x" to copy your commit from master to your
> > local copy of 2.29 branch.
> 
> I have little experience with git cherry-pick, so I am a little
> hesitated to do it.  But I will try it anyway.

Nothing wrong may happen until you do git push.  (This sentence should
not stop you from git push anyway.)  Remember, you will be pushing to
2.29 branch, not master.

I've just learned recently about this document which will help you:
https://sourceware.org/glibc/wiki/GlibcGit#Cherry_Pick_Changes_From_Another_Branch

> > Hint 2: You should update NEWS file in the
> > branch manually.  Yes, lots of people forget it but please do it.
> 
> I saw some commits already backported on 2.29 branch.  Perhaps, I
> should add one line to NEWS file as follows.
> 
> [...]

You should mark the bug as Resolved/Fixed and set the Target Milestone
to 2.30 first.  Then you can run the script:

  $ ./scripts/list-fixed-bugs.py 2.30

which will list the NEWS for 2.30 release.  You will be able to find the
line which applies to your bug and copy it.

But now I can see that this bug is only half-fixed because it mentions the
BC direction as well.  No reason to mention it as fixed in NEWS then.
Whether to backport the patch it's up to you, my suggestion is yes,
backport.

> > Hint 3: Most likely you will have a conflict in the ChangeLog, you
> > will have to resolve it manually.
> 
> Hmm, I will try it anyway.

The link above will help you.

> By the way, is there a plan to release 2.29.1?

I asked a similar question before and the answer (if I remember correctly)
was: no, but distros are free to apply the upstream patches, and some of
them (e.g., Fedora) do this regularly.

Regards,

Rafal