Re: [FYI] {yl-work-for-master} fixup: remove double news entry

[Stefano Lattarini]

On 02/13/2012 06:51 PM, Eric Blake wrote:
> On 02/13/2012 10:45 AM, Stefano Lattarini wrote:
>> On 02/13/2012 04:47 PM, Peter Rosin wrote:
>>>
>>> I have pushed the following as obvious:
>>>
>>> From: Peter Rosin <address@hidden>
>>> Date: Mon, 13 Feb 2012 16:43:34 +0100
>>> Subject: [PATCH] fixup: remove double news entry
>>>
>>> * NEWS: Remove double (stale) news entry introduced by a botched
>>> merge.
>>>
>> Thanks.
>>
>> And I think it is now time to find a format for the list of user-visible
>> changes that is more merge-friendly than a monolithic NEWS file ...
>>
>> Suggestions?
> 
> Per 'man gitattributes', git understands a 'union' merge driver, which
> takes lines from both versions of a file rather than leaving conflict
> markers (the way the default text merge driver behaves).  It may not
> leave the merged items in any particular order, but would certainly be
> easier to review, since by default, all NEWS merges should take all
> entries from both branches.
>
Thanks for the pointer.  I've applied the attached patches to maint (and
merged maint into the relevant branches).  I'm not sure whether it will
truly solve our issue here, but certainly it can't worsen the present
situation, and is worth a shot IMO.

> Or maybe it's time to write a custom merge driver for NEWS, similar to
> the custom merge file for ChangeLog?
> 
If someone volunteers to do so, I'd be glad to try such a merge driver
in Automake.  But first let's see if the gitattributes solution works
good enough.

Thanks,
  Stefano

0001-gitattributes-use-union-merge-driver-for-NEWS.patch
Description: Text Data

0002-gitattributes-custom-merge-driver-for-ChangeLog-not-.patch
Description: Text Data