This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Backported r185234 from trunk (r194264 from google/gcc-4_7). (issue 6904043)
- From: Diego Novillo <dnovillo at google dot com>
- To: asharif at chromium dot org, shenhan at google dot com, cmtice at google dot com, carrot at google dot com, gcc-patches at gcc dot gnu dot org, reply at codereview-hr dot appspotmail dot com
- Date: Thu, 6 Dec 2012 17:02:15 -0500
- Subject: Re: Backported r185234 from trunk (r194264 from google/gcc-4_7). (issue 6904043)
- References: <047d7b5d33ac74034004d0361b0e@google.com>
On Thu, Dec 6, 2012 at 4:51 PM, <asharif@chromium.org> wrote:
> I don't think the rule is to *only* update ChangeLog.google*. The rule
> is to update ChangeLog, but also update ChangeLog.google*.
Just ChangeLog.google*, actually. When cherry picking revisions from
other branches, it's better not to update ChangeLog. It's not really
necessary and it will actually cause merge conflicts later. I'll
clarify the developer notes.
Thanks. Diego.