X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fp4desc;h=2d1c9d8219fdf1ec9f791a3f87b0058c32ee4cb2;hb=1285de5cbb12e1e7ecf3b6b1eb8ec0d79857c24b;hp=cdbd9572e18642fa906c2c1fb0b311ab42cb6b8d;hpb=9058bc9b7176f7a8d171bb316d39680b3246ce5f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Porting/p4desc b/Porting/p4desc index cdbd957..2d1c9d8 100755 --- a/Porting/p4desc +++ b/Porting/p4desc @@ -85,7 +85,8 @@ if ($cur) { warn "$newfile add, revision != 1!\n" unless $newfile =~ /#1$/; } } else { - $_ = "# Skipped: $_"; + push @skipped, "# $_"; + $_ = ''; } } warn "file [$file] line [$cur] file# [$fnum]\n" if $v; @@ -93,6 +94,7 @@ if ($cur) { if (m|^==== //depot/|) { $skip = !m|$branches|; + print "# Skipped because not under branches: $branches\n" if $skip; } $_ = "# $_" if $skip; @@ -108,6 +110,9 @@ if (/^Change (\d+) by/) { if (eof) { $_ .= newfiles(); + $_ .= join('', "\n", + "# Skipped because not under branches: $branches\n", + @skipped, "\n") if @skipped; } sub newfiles {