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
>From 018a186636ba4078496f56a945d25087bca127a3 Mon Sep 17 00:00:00 2001 Message-Id: <018a186636ba4078496f56a945d25087bca127a3.1335455239.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu, 26 Apr 2012 17:47:14 +0200 Subject: [PATCH] maint: don't use "union" merge driver for NEWS anymore The use of the "union" merge driver to avoid conflicts in NEWS has proven to be problematic, as it often silently produced mis-merges (instead of spurious conflicts, but a spurious conflict is better than a mis-merge). Also, our new branching policy (see automake bug#11153 for a description) should greatly mitigate the problem of merge conflicts in NEWS. For further discussion, see: <http://lists.gnu.org/archive/html/automake-patches/2012-04/msg00148.html> Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 5126add..0d86adb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -NEWS merge=union *.texi* diff=texinfo -- 1.7.9.5
