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

[Stefano Lattarini]

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
>> cleanly.
>>
>> So I wish to take back my proposed patch, and substitute it with
>> a trivial patch that just edit '.gitattributes' not to specify the
>> "union" merge driver for NEWS anymore.
>>
>> WDYT?
> 
> It's your call as maintainer, for whatever you think will be easiest to
> maintain over long-term merges; if our new branching policy makes it
> possible to enforce good NEWS entries across both branches,
>
I think it will; and instead of adding new complexity that might be
unwarranted, I'd like to try out the simpler solution first.  So
I've pushed the attached patch (to maint).  Will merge to master soon.

> then simpler is reasonable.
> 
Agreed.

Thanks,
  Stefano

0001-maint-don-t-use-union-merge-driver-for-NEWS-anymore.patch
Description: Text Data