X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fp4d2p;h=8003bf71a5bd78983107bcb4a2ca54895eaf3fc9;hb=6af654855041e350ad1ba2c39f0be19af24f50c6;hp=f645ef807e1e320c397ff25cbf46c3ff21984dc7;hpb=146174a91a192983720a158796dc066226ad0e55;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/p4d2p b/Porting/p4d2p
index f645ef8..8003bf7 100755
--- a/Porting/p4d2p
+++ b/Porting/p4d2p
@@ -1,4 +1,4 @@
-#!/l/local/bin/perl -wspi.bak
+#!/usr/bin/perl -wspi~
 
 #
 # reads a perforce style diff on stdin and outputs appropriate headers
@@ -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