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
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
Hi Eric, thanks for the feedback.
On 04/26/2012 04:17 PM, Eric Blake wrote:
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
On 04/26/2012 09:14 AM, Stefano Lattarini wrote:
Now that we only have 'master' and 'maint' as long-lived branches
(ok, there's 'ng/master' as well, but there we have a separated
file 'NG-NEWS'), the NEWS changes should merge and sync easily and
cleanly.
So I wish to take back my proposed
On 04/26/2012 05:17 PM, Eric Blake wrote:
On 04/26/2012 09:14 AM, Stefano Lattarini wrote:
Now that we only have 'master' and 'maint' as long-lived branches
(ok, there's 'ng/master' as well, but there we have a separated
file 'NG-NEWS'), the NEWS changes should merge and sync easily and
