Re: [PATCH] {maint} news: break up in two files, one for maint, one for master

[Eric Blake]

On 04/26/2012 03:30 AM, Stefano Lattarini wrote:
> This will avoid a lot of useless conflicts or botched merges in the
> NEWS file.  These have already happened many times with our old setup
> where there was just one NEWS files.
> 
> * NEWS: Removed, split into ...
> * NEWS.maint, old/NEWS: ... these two files.
> * NEWS.master: New file, still empty (it will be filled in master
> only).
> * Makefile.am (EXTRA_DIST): Distribute them.
> (NEWS): Generate it by properly concatenating the three new files.

Ah, so there is still a NEWS file in tarballs, it's just that the split
makes it easier to ensure that the generated NEWS file is always in the
correct order regardless of which branch you are building the tarball
from, and that merging one branch into another won't hit any conflicts
because the NEWS items in the various branches go to the correct
building-block in the first place.  Seems like an interesting solution.

-- 
Eric Blake   address@hidden    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature