On Fri, Aug 30, 2013 at 10:38:51AM +0200, Marek Polacek wrote:
> On Fri, Aug 30, 2013 at 10:15:44AM +0200, Jakub Jelinek wrote:
> > So, can you please post a new final patch for the merge (with the new
> > directories
> > or files in libsanitizer/ just listed in the ChangeLog entries, but not
> > actually included in the patch, that would make it too large and anyone can
> > look at libsanitizer/ubsan/ on the branch)?
>
> Yep. This is diff between trunk and the ubsan branch without new
> files.
>
> BTW, when merging the ChangeLog.ubsan into normal ChangeLog, should I
> change the CL entry dates to the day of the merge into the trunk, or
> can I keep them as they are?
Usually you write a new ChangeLog entry (per changed directory) that
summarizes all the changes, using the current date. So, e.g. for the new
files you just mention * ubsan.c: New file. etc. and don't list all the
follow-up changes.
Jakub
