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 <p...@lysator.liu.se> >>> 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
>From f874f9eeb7d996a7fc56c11342e9a094a87a402a Mon Sep 17 00:00:00 2001 Message-Id: <f874f9eeb7d996a7fc56c11342e9a094a87a402a.1329222347.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Tue, 14 Feb 2012 13:21:26 +0100 Subject: [PATCH 1/2] gitattributes: use "union" merge driver for NEWS This should help in reducing the spurious merge conflicts for the NEWS file, which have already caused a great deal of confusion and wasted time. Suggestion by Eric Blake: http://lists.gnu.org/archive/html/automake-patches/2012-02/msg00119.html * .gitattributes (NEWS): Use the "union" merge driver. --- .gitattributes | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitattributes b/.gitattributes index b6c3614..6fec56e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ ChangeLog merge=merge-changelog +NEWS merge=union *.texi* diff=texinfo -- 1.7.7.3
>From 06684c510ab3115093178cdcfb28c2fff41b324c Mon Sep 17 00:00:00 2001 Message-Id: <06684c510ab3115093178cdcfb28c2fff41b324c.1329222347.git.stefano.lattar...@gmail.com> In-Reply-To: <f874f9eeb7d996a7fc56c11342e9a094a87a402a.1329222347.git.stefano.lattar...@gmail.com> References: <f874f9eeb7d996a7fc56c11342e9a094a87a402a.1329222347.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Tue, 14 Feb 2012 13:25:35 +0100 Subject: [PATCH 2/2] gitattributes: custom merge driver for ChangeLog not needed anymore * .gitattributes: We don't maintain a version-controlled ChangeLog file anymore, so we have no need to specify a custom merge driver for it anymore. Update accordingly. --- .gitattributes | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6fec56e..5126add 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ -ChangeLog merge=merge-changelog NEWS merge=union *.texi* diff=texinfo -- 1.7.7.3
