Front page | perl.perl5.porters |
Postings from November 2000
Re: Patching on devel track malfuncioning
From:
andreas.koenig
Date:
November 15, 2000 22:54
Subject:
Re: Patching on devel track malfuncioning
Message ID:
m3u298iezh.fsf@ak-71.mind.de
>>>>> On Wed, 15 Nov 2000 21:19:45 -0800, Gurusamy Sarathy <gsar@ActiveState.com> said:
> 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.
Thanks, that's easy, I'll do.
>> 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.
Extracting the two versions from 5.6.0 and 5.7.0 and diffing:
% tar xvvzf /home/ftp/pub/CPAN/authors/id/G/GS/GSAR/perl-5.6.0.tar.gz perl-5.6.0/lib/ExtUtils/MM_Cygwin.pm
-r--r--r-- gsar/gsar 3077 2000-02-06 20:25:22 perl-5.6.0/lib/ExtUtils/MM_Cygwin.pm
% tar xvvzf /home/ftp/pub/CPAN/authors/id/J/JH/JHI/perl-5.7.0.tar.gz perl-5.7.0/lib/ExtUtils/MM_Cygwin.pm
-r--r--r-- jhi/users 3233 2000-08-31 19:39:24 perl-5.7.0/lib/ExtUtils/MM_Cygwin.pm
% diff -u perl-5.6.0/lib/ExtUtils/MM_Cygwin.pm perl-5.7.0/lib/ExtUtils/MM_Cygwin.pm
--- perl-5.6.0/lib/ExtUtils/MM_Cygwin.pm Sun Feb 6 20:25:22 2000
+++ perl-5.7.0/lib/ExtUtils/MM_Cygwin.pm Thu Aug 31 19:39:24 2000
@@ -71,6 +71,8 @@
push(@m,"\n");
if (%{$self->{MAN1PODS}} || %{$self->{MAN3PODS}}) {
+ grep { $self->{MAN1PODS}{$_} =~ s/::/./g } keys %{$self->{MAN1PODS}};
+ grep { $self->{MAN3PODS}{$_} =~ s/::/./g } keys %{$self->{MAN3PODS}};
push @m, "\t$self->{NOECHO}\$(POD2MAN) \\\n\t";
push @m, join " \\\n\t", %{$self->{MAN1PODS}}, %{$self->{MAN3PODS}};
}
And patch 7642 has exactly this:
==== //depot/perl/lib/ExtUtils/MM_Cygwin.pm#5 (text) ====
Index: perl/lib/ExtUtils/MM_Cygwin.pm
--- perl/lib/ExtUtils/MM_Cygwin.pm.~1~ Sat Nov 11 16:02:42 2000
+++ perl/lib/ExtUtils/MM_Cygwin.pm Sat Nov 11 16:02:42 2000
@@ -71,6 +71,8 @@
push(@m,"\n");
if (%{$self->{MAN1PODS}} || %{$self->{MAN3PODS}}) {
+ grep { $self->{MAN1PODS}{$_} =~ s/::/./g } keys %{$self->{MAN1PODS}};
+ grep { $self->{MAN3PODS}{$_} =~ s/::/./g } keys %{$self->{MAN3PODS}};
push @m, "\t$self->{NOECHO}\$(POD2MAN) \\\n\t";
push @m, join " \\\n\t", %{$self->{MAN1PODS}}, %{$self->{MAN3PODS}};
}
There *is* something fishy.
>> 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.
In this case it is difficult for me to give evidence, I'll have to
invent something. Do you have some checksums of perlio.c's history?
Ahh, maybe this helps:
% zgrep '^==== //depot/perl/perlio.c' diffs/<7400-7700>.gz
diffs/7427.gz:==== //depot/perl/perlio.c#22 (text) ====
diffs/7547.gz:==== //depot/perl/perlio.c#23 (text) ====
diffs/7552.gz:==== //depot/perl/perlio.c#24 (text) ====
diffs/7558.gz:==== //depot/perl/perlio.c#25 (text) ====
diffs/7566.gz:==== //depot/perl/perlio.c#26 (text) ====
diffs/7567.gz:==== //depot/perl/perlio.c#27 (text) ====
diffs/7575.gz:==== //depot/perl/perlio.c#28 (text) ====
diffs/7577.gz:==== //depot/perl/perlio.c#29 (text) ====
diffs/7603.gz:==== //depot/perl/perlio.c#30 (text) ====
diffs/7644.gz:==== //depot/perl/perlio.c#32 (text) ====
diffs/7645.gz:==== //depot/perl/perlio.c#33 (text) ====
diffs/7650.gz:==== //depot/perl/perlio.c#34 (text) ====
diffs/7657.gz:==== //depot/perl/perlio.c#35 (text) ====
diffs/7666.gz:==== //depot/perl/perlio.c#36 (text) ====
diffs/7670.gz:==== //depot/perl/perlio.c#37 (text) ====
diffs/7672.gz:==== //depot/perl/perlio.c#38 (text) ====
diffs/7679.gz:==== //depot/perl/perlio.c#39 (text) ====
diffs/7680.gz:==== //depot/perl/perlio.c#40 (text) ====
diffs/7685.gz:==== //depot/perl/perlio.c#41 (text) ====
Note that #31 is missing.
>> 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.
Thanks a lot!
--
andreas