[Development] ChangeLogs

[Thiago Macieira]

On segunda-feira, 21 de janeiro de 2013 17.02.10, Tor Arne Vestbø wrote:
> On 1/21/13 16:37 , Giuseppe D'Angelo wrote:
> > On 21 January 2013 15:08, Tor Arne Vestbø <tor.arne.vestbo at digia.com> 
wrote:
> >> If you're writing the ChangeLog entry at commit time, not right before
> >> the release, why can't your patch contain a change to dist/changelog
> >> from the get-go which, can be reviewed and integrated along with the
> >> code change?
> > 
> > Because that usually causes silly conflicts when staging (=>merging)
> > the patch. :(
> 
> That can be solved by a git merge-driver for the changelog format.

Note: the merging is done by Gerrit.
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20130121/d64ebf5a/attachment.sig>