Front page | perl.perl5.porters |
Postings from November 2000
On 15 Nov 2000 09:31:37 +0100, Andreas J. Koenig wrote: >When I apply patches from rpository in order, I get rejects and a >MANIFEST conflict. > >1) Patch 7632 says > >Reversed (or previously applied) patch detected! Skipping > patch. >1 out of 1 hunk ignored -- saving rejects to lib/unicode/syllables.txt.rej That patch is patching out CRs in syllables.txt, so if you stripped them out of the entire tree earlier, apply with --ignore-space. Or ignore the reject. >2) Patch 7642 says > >Reversed (or previously applied) patch detected! Skipping > patch. >1 out of 1 hunk ignored -- saving rejects to lib/ExtUtils/MM_Cygwin.pm.rej The patch is correct. I suspect your sources somehow got muddled. p4 print //depot/perl/lib/ExtUtils/MM_Cygwin.pm@7641 doesn't show the two lines that are being added by the patch, contrary to what you said. The last edit to MM_Cygwin.pm happened at change#5008 (i.e. before 5.6.0) and you'll note the 5.6.0 version of the file doesn't have those lines either. >3) Patch 7685 says > >1 out of 14 hunks FAILED -- saving rejects to perlio.c.rej This appears to be the same issue as item 2 above. The patch is showing the right edit, and the deleted lines are there at that rev, so I'm not sure how you're getting the problem. >4) And Configure complains > >First let's make sure your kit is complete. Checking... >ls: ext/Encode/Encode/iso8859-10.enc: No such file or directory >ls: ext/Encode/Encode/iso8859-13.enc: No such file or directory >ls: ext/Encode/Encode/iso8859-14.enc: No such file or directory >ls: ext/Encode/Encode/iso8859-15.enc: No such file or directory This is due to the files being marked as binary, as you noted. Not sure why they were marked as binary to begin with, since they don't appear to have any "binary" bytes. I've manually fixed up the patch. Sarathy gsar@ActiveState.comThread Previous | Thread Next