diff options
| author | Jan Dubois <jand@activestate.com> | 2003-10-30 10:43:08 -0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-10-31 19:19:00 +0000 |
| commit | ee950a0c9a9d3ecf5257e0b7b480b83676106a22 (patch) | |
| tree | 99b0be8d399673881483c67613876afedb56f811 /Porting/p4d2p | |
| parent | 838efab482d30d6a82835e2296e673cfa68c80a7 (diff) | |
| download | perl-ee950a0c9a9d3ecf5257e0b7b480b83676106a22.tar.gz | |
change p4d2p to deal with new style diff2 output
Message-ID: <dpi3qvgf1uke7pj1gcpgmoh622lqcvl6uc@4ax.com>
p4raw-id: //depot/perl@21587
Diffstat (limited to 'Porting/p4d2p')
| -rwxr-xr-x | Porting/p4d2p | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Porting/p4d2p b/Porting/p4d2p index 83b0021da5..8003bf71a5 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 |