Re: [commit 1/3] Import gnulib's update-copyright script

Pedro Alves
2012-04-18T14:45:36Z

On 04/18/2012 03:36 PM, Joel Brobecker wrote:

>>> gdb/ChangeLog:
>>>
>>> * gnulib/extra/update-copyright: New file, imported from gnulib.
>>
>>
>> It looks like this file was simply copied over instead of imported with
>> gnulib-tool? If I reimport the gnulib/ directory from scratch, we lose it:
>
> I am pretty sure I pulled it using gnulib tool... But I think
> I then just selectively checked the script in only, to avoid
> bringing in more changes than necessary.
>
> This business of maintaining our gnulib import is getting a little
> silly, because we cannot determine for sure how people might have
> imported stuff. Perhaps we should just go ahead with the script
> I wrote to import/update our gnulib import, and make sure people
> use that? It might not be the perfect way of doing it, but at least
> it would be consistent.

I don't see how that scripts would have prevented the selective
check-in. :-) It may help by keeping the git version in some
script variable, that the script checks, instead of having to fetch
the version from the ChangeLog? The new gnulib/ parent directory
seems like a good place for this stuff.

>
>> If I pull the "update-copyright" gnulib module in addition, with:
> [...]
>> then we get it back, but, we get an older 2010 version, thus we end up
>> with a non-empty diff, see below.
>
> Do you know why? I thought that it would just import whatever version
> you have checked out. Did you do the import using the exact same
> version that you used during the last import?

Yes, exactly. The last import was:

2010-05-23 Pedro Alves <pedro@codesourcery.com>

Update gnulib from latest git.
(250b80067c1e1d8faa0c42fb572f721975b929c5)

That's the git hash. So I'm picking up that date's version.

>
> When I did this, I just pulled the latest gnulib from git, and then
> called gnulib tool. That's why I am a little confused by you saying
> that you'll update gnulib using gnulib-tool.
>
>> It doesn't look like we miss anything important for us. I think I'll
>> apply this,
>
> We'll need the latest version by the end of the year. There are two
> things that it brings which we use: warnings when an FSF copyright
> isn't found, and also merging all copyright years together into
> one single range.
>
>> Okay in principle?
>
> Sure! I think you know how to use gnulib way better than I do.

Okay. :-)

--
Pedro Alves