Re: Fwd: Cron <address@hidden> /mit/ncurses/auto/update-ncurses.py

[Thomas Dickey]

On Sun, Apr 08, 2012 at 10:45:52AM -0400, "Alejandro R. Sede??o" wrote:
> On 4/8/2012 6:00 AM, Thomas Dickey wrote:
>> On Sun, Apr 08, 2012 at 02:31:25AM -0400, "Alejandro R. Sede??o" wrote:
>>> FYI: The $Id$ lines in NEWS that last week's patch added and this week's
>>> patch removed did not match, so the patch does not apply cleanly. On the
>>> plus side, it's a trivial fix.
>>
>> I uploaded an amended patch.  Looking at the history, it shows that I made
>> a build-fix last week and did not notice that I'd forgotten to regenerate my
>> staging directory (used for uploads, not for builds).
>>
>>> For reference, here's the NEWS $Id$ line that
>>> ncurses-5.9-20120331.patch.gz set:
>>>
>>> -- $Id: NEWS,v 1.1885 2012/03/31 23:10:23 tom Exp $
>>>
>>> and what was expected by ncurses-5.9-20120407.patch.gz:
>>>
>>> -- $Id: NEWS,v 1.1886 2012/03/31 23:44:45 tom Exp $
>>
>
> $ gunzip -c ../../patches/ncurses-5.9-20120407.patch.gz | git apply
> <stdin>:376: trailing whitespace.
>  * a) capabilities listed past the "STOP-HERE" comment in the Caps file.
> error: patch failed: NEWS:45
> error: NEWS: patch does not apply
>
> Now both this week's and last week's patches add:
>
>  20120331
> +        + update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317).

sorry (I was in too much of a hurry early this morning).  I see that
the problem with last week's patch was that I had edited the file, but
not checked it in.  So I made a patch with just the id-line modified as
you first suggested (and it applies correctly here).

that's on my ftp area now...

-- 
Thomas E. Dickey <address@hidden>
http://invisible-island.net
ftp://invisible-island.net

signature.asc
Description: Digital signature