lynx-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: LYNX-DEV patch problem in ../lynx2.7.1ac-0.89--2.7.1ac-0.91.diff.gz


From: Klaus Weide
Subject: Re: LYNX-DEV patch problem in ../lynx2.7.1ac-0.89--2.7.1ac-0.91.diff.gz
Date: Fri, 7 Nov 1997 17:01:37 -0600 (CST)

On Fri, 7 Nov 1997, Larry W. Virden, x2487 wrote:

> I obtained the patches today and was distressed to see a number of
> failed patches.  I will go back and pick up a full tar file now, but
> wanted to mention the following:
> 
> first bit patched fine, then
> :
> :
> 
> can't find file to patch at input line 4919
> The text leading up to this was:
> --------------------------
> |Index: lynx2-7-1/docs/CHANGES2-7
> |*** lynx2-7-1/docs/CHANGES.orig Sat, 05 Apr 1997 11:29:38 -0700 kweide 
> (Lynx/h/47_CHANGES 1.2 644) 2.7.1ac-0.89
> |--- lynx2-7-1/docs/CHANGES2-7      Fri, 07 Nov 1997 04:30:54 -0700 kweide 
> (Lynx/h/47_CHANGES 1.3 644) 2.7.1ac-0.91
> --------------------------
> File to patch: docs/CHANGES2-7
> docs/CHANGES2-7: No such file or directory
> Skip this patch? [y] 
> Skipping patch.
> 1 out of 1 hunk ignored

The docs/CHANGES was renamed to docs/CHANGES2-7 and also modified.  That
gives problems.  I should have sent a warning to the list.

> patching file `docs/README.chartrans'
> patching file `src/chrtrans/makeuctb.c'
> patching file `src/chrtrans/README.format'
> patching file `src/chrtrans/cp437_uni.tbl'
> patching file `src/chrtrans/iso08_uni.tbl'
> patching file `src/chrtrans/iso01_uni.tbl'
> Hunk #2 FAILED at 75.
> 1 out of 2 hunks FAILED -- saving rejects to src/chrtrans/iso01_uni.tbl.rej

The 0.89 incarnation of that file had a last line that didn't end with a
line feed.  Programs like diff and patch don't like that.  (makeuctb also
was complaining about it.)

> :
> :
> 
> patching file `INSTALLATION'
> Hunk #5 FAILED at 385.
> 1 out of 7 hunks FAILED -- saving rejects to INSTALLATION.rej

I don't know what is wrong there - but you have the .rej file.

Well, in this case you did manage to get everything needed to compile the
program, and you could get the files with problems from the breakout dir
<URL:http://sol.slcc.edu/lynx/current/lynx2-7-1/>.

I tweaked to patch-o-matic to use an older version of the prcs program
for now (if "Include new files" is in effect), that wasn't trying to be
so clever and match up renamed or moved files.  So it should now again
create a diff against an empty file in such cases.  No gurantee this will
always work - if you already have a file by that name file, or if things
get changed back and forth, etc.  And of course you have to get rid of
removed files yourself (like before).

  Klaus

;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;

reply via email to

[Prev in Thread] Current Thread [Next in Thread]