Re: Abolishing ChangeLog files

[Eli Zaretskii]

> From: Steve Youngs <address@hidden>
> Date: Fri, 29 Mar 2013 18:02:40 +1000
> Keywords: method,information,problem,place,logging
> 
> Your method does nothing to alleviate the problem of recurring conflicts
> on the ChangeLog files.

These conflicts only happen if changes are applied manually with
'patch' or similar.  When merging between branches, bzr handles
ChangeLog files specially, and avoids conflicts caused by addition of
entries.