On 12-05-16 19:22 , jin...@google.com wrote:
In my opinion, gcc/ChangeLog is for upstream commits only. It is fine that you want to port upstream gcc/ChangeLog as well. Just remove your identities +2012-05-11 Han Shen <shen...@google.com> + + Backported r187569 from branches/google/gcc-4_6.
The convention for branches is that all the commits to them should get ChangeLog entries in the file ChangeLog.<branch-tag>
where <branch-tag> is generally the basename of the branch URL, though it is sometimes changed slightly. In the google branches we use the convention 'google-<name>' for all the branches under google/*
Diego.