X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fp4d2p;h=8003bf71a5bd78983107bcb4a2ca54895eaf3fc9;hb=696814337d4eac8d0663d5307d6e01964d1b2897;hp=83b0021da5960c5d3ecbd1f9843a843caa3e07be;hpb=70dff1ffd3015a4493d81957b4a83083b5c17679;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Porting/p4d2p b/Porting/p4d2p index 83b0021..8003bf7 100755 --- a/Porting/p4d2p +++ b/Porting/p4d2p @@ -36,7 +36,7 @@ USAGE } my ($cur, $match); -$cur = m<^==== //depot/(.+?)\#\d+.* ====$> ... m<^(\@\@.+\@\@|\*+)$>; +$cur = m<^==== //depot/(.+?)\#\d+.* ====( \w+)?$> ... m<^(\@\@.+\@\@|\*+)$>; $match = $1; @@ -71,7 +71,7 @@ if ($cur) { } } # see if we hit another patch (i.e. previous patch was empty) - elsif (m<^==== //depot/(.+?)\#\d+.* ====$>) { + elsif (m<^==== //depot/(.+?)\#\d+.* ====( \w+)?$>) { $file = $match = $1; } # suppress all other lines in the header