[PATCH] p4genpatch

p4genpatch adds diffs from branches we're not interested in if a
changeset is for more than one branch. This only happens for branches
perlio (patch 13945) and perlext (patches <= 357) and only patch 13945
made this mistake visible. Don't know why I didn't catch this earlier.

The tools perlpatch2svn and buildaperl are already filtering their
input correctly, so there's no need to recreate the whole APC, maybe
recreating 13945 makes sense.


-- 
andreas

--- /usr/sources/perl/repoperls/perl-p-5.8.0@18958/Porting/p4genpatch	Sat Jun  1 19:02:49 2002
+++ SVN/Porting/p4genpatch	Thu Mar 13 16:11:01 2003
@@ -23,7 +23,7 @@
 my $VERSION = '0.05';
 my $TOPDIR = cwd();
 my @P4opt;
-our %OPT = ( "d" => "u", b => "//depot/perl", "D" => "diff" );
+our %OPT = ( "d" => "u", b => "//depot/perl/", "D" => "diff" );
 Getopt::Long::Configure("no_ignore_case");
 GetOptions(\%OPT, "b=s", "p=s", "d=s", "D=s", "h", "v", "V") or die Usage;
 print Usage and exit if $OPT{h};
@@ -42,6 +42,7 @@
   print;
   next unless m|($OPT{b})|;
   my($prefix) = $1;
+  $prefix =~ s|/$||;
   $prefix =~ s|/[^/]+$||; # up to the last "/" in the match is to be stripped
   if (my($file,$action) = m|^\.\.\. (//depot.*)\s(\w+)$|) {
     next if $action eq "delete";
@@ -160,9 +161,10 @@
       -p host:port    p4 port (e.g. myhost:1666)
       -d diffopt      option to pass to diff(1)
       -D diff         diff(1) to use
-      -b branch(es)   which branches to include (regex); everything up
-                      to the last slash of matched portion of path is
-                      stripped on local copy (default: //depot/perl)
+      -b branch(es)   which branches to include (regex); the last
+                      directory within the matched part will be
+                      preserved on the local copy, so that patch -p1
+                      will work (default: "//depot/perl/")
       -v              verbose
       -h              print this help and exit
       -V              print version number and exit

• [PATCH] p4genpatch by andreas.koenig
• Re: [PATCH] p4genpatch by Rafael Garcia-Suarez
• Re: [PATCH] p4genpatch by andreas.koenig