From: Jan Dubois <jand@activestate.com>
Date: Thu, 30 Oct 2003 18:43:08 +0000 (-0800)
Subject: change p4d2p to deal with new style diff2 output
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee950a0c9a9d3ecf5257e0b7b480b83676106a22;p=p5sagit%2Fp5-mst-13.2.git

change p4d2p to deal with new style diff2 output
Message-ID: <dpi3qvgf1uke7pj1gcpgmoh622lqcvl6uc@4ax.com>

p4raw-id: //depot/perl@21587
---

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