Re: [PATCH] maint: add a rule to use gnulib's update-copyright

[Stefano Lattarini]

On 02/14/2012 09:55 PM, Jim Meyering wrote:
> Stefano Lattarini wrote:
>> Hi Jim.
>>
>> On 02/12/2012 06:57 PM, Jim Meyering wrote:
>>>
>>> Here's the adjusted c-set:
>>>
>>> From 21b627dbec3347c2befde186c65592b9f177cd8d Mon Sep 17 00:00:00 2001
>>> From: Jim Meyering <address@hidden>
>>> Date: Sun, 12 Feb 2012 16:57:42 +0100
>>> Subject: [PATCH] maint: add a rule to use gnulib's update-copyright
>>>
>>> * lib/update-copyright: New file, from gnulib.
>>> * Makefile.am (FETCHFILES): Add update-copyright to the list.
>>> (fetch): Fetch it.
>>> (update-copyright): New rule.
>>> ---
>>>  Makefile.am          |   13 ++-
>>>  lib/update-copyright |  274 
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++
>>>  2 files changed, 286 insertions(+), 1 deletions(-)
>>>  create mode 100755 lib/update-copyright
>>>
>> Do you plan to push this change, or should I do so?
> 
> Hi Stefano,
> 
> I've rebased and pushed it.
> 
Thanks!

> FYI, running "make update-copyright" on maint prints this:
> 
>   git ls-files | grep -Ev 'COPYING|INSTALL' \
>     | UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=2 xargs 
> ./lib/update-copyright
>   .gitattributes: warning: copyright statement not found
>   .gitignore: warning: copyright statement not found
>   AUTHORS: warning: copyright statement not found
>   THANKS: warning: copyright statement not found
>   contrib/README: warning: copyright statement not found
>   doc/amhello/README: warning: copyright statement not found
>   lib/ansi2knr.1: warning: copyright statement not found
>   lib/ansi2knr.c: warning: copyright statement not found
>   lib/depcomp: warning: copyright statement not found
>   lib/install-sh: warning: copyright statement not found
>   lib/mkinstalldirs: warning: copyright statement not found
>   m4/acdir/dirlist: warning: copyright statement not found
>   tests/ChangeLog-old: warning: copyright statement not found
>   tests/README: warning: copyright statement not found
>   tests/aclocal.in: warning: copyright statement not found
>   tests/automake.in: warning: copyright statement not found
> 
> which looks ok.
> I propose to push the result of doing this:
> 
>   $ git ci -m 'maint: run "make update-copyright"' -a
>   [maint aafc6b5] maint: run "make update-copyright"
>    1041 files changed, 1041 insertions(+), 1266 deletions(-)
> 
Hmm...  It now occurs to me that, if we apply such a change to maint,
we risk to incur in a lot of spurious merge conflicts when merging
maint back to the active branches, since the copyright lines of
several files in such branches have been modified in the meantime
(in particular, in master, the copyright line of *all* the test
cases has been modified in 2011).  Maybe we should just wait until
'yl-work-for-master' is merged back to master, and then run "make
update-copyright" on master only?  I think this might be acceptable
because I plan to release automake 1.12 in two or three months,
without any further 1.11.x maintenance release.  WDYT?

Thanks,
  Stefano