From owner-svn-src-all@FreeBSD.ORG  Sat Dec  7 18:46:26 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1B2C8B26;
 Sat,  7 Dec 2013 18:46:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E194611E2;
 Sat,  7 Dec 2013 18:46:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7IkP3K077771;
 Sat, 7 Dec 2013 18:46:25 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7IkPDR077770;
 Sat, 7 Dec 2013 18:46:25 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201312071846.rB7IkPDR077770@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 7 Dec 2013 18:46:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-svnadmin@freebsd.org
Subject: svn commit: r259075 - svnadmin/hooks/scripts
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Dec 2013 18:46:26 -0000

Author: peter
Date: Sat Dec  7 18:46:25 2013
New Revision: 259075
URL: http://svnweb.freebsd.org/changeset/base/259075

Log:
  Add a -t / -r mode so it can be run on either a proto-txn or an existing
  rev for testing.  Update explanation text.

Modified:
  svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl

Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==============================================================================
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl	Sat Dec  7 18:27:21 2013	(r259074)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl	Sat Dec  7 18:46:25 2013	(r259075)
@@ -65,9 +65,10 @@ my $svnlook = "/usr/bin/svnlook";
 ######################################################################
 # Initial setup/command-line handling.
 
-&usage unless @ARGV == 2;
+&usage unless @ARGV == 3;
 
 my $repos        = shift;
+my $mode         = shift;
 my $txn          = shift;
 
 unless (-e $repos) {
@@ -100,12 +101,12 @@ chdir($tmp_dir)
 my $state = 0;
 my $path;
 my @errors;
-foreach my $line (&read_from_process($svnlook, 'diff', $repos, '-r', $txn)) {
+foreach my $line (&read_from_process($svnlook, 'diff', $repos, $mode, $txn)) {
   #printf "line: %s, current state %d\n", $line, $state;
   if ($state == 0 && $line =~ /^Property changes on: (.*)$/) {
     $path = $1;
     given ($path) {
-      when (/stable\/([0-9]+)/) { if ($1 >= 10) { $state = 1; } else { $state = 0; } }
+      when (/stable\/([0-9]+)\//) { if ($1 >= 10) { $state = 1; } else { $state = 0; } }
       default { $state = 0; }
     }
     #printf "path: %s, state %d\n", $path, $state;
@@ -119,7 +120,7 @@ foreach my $line (&read_from_process($sv
   if ($state == 2) {
     given ($line) {
       when (/^Added: svn:mergeinfo/) {
-	push @errors, "$path : svn:merginfo added at somewhere other than root";
+	push @errors, "$path : svn:merginfo ADDED";
       }
       when (/^================/) { $state = 0; }
     }
@@ -131,9 +132,16 @@ foreach my $line (&read_from_process($sv
 # and will not see this verbose message more than once.
 if (@errors) {
     warn "$0:\n\n", join("\n", @errors), "\n\n", <<EOS;
-    svn merge should be done at the root directory to prevent
-    spread of stray mergeinfo records.  This commit adds new
-    mergeinfo.
+    If you use "svn merge" then it must be done at the top directory
+    directory to prevent spread of mergeinfo records.  Resulting
+    commits must ALSO be done from the root directory.
+
+    This applies to the stable/10 or higher branches.
+
+    This commit was aborted because it would have added NEW mergeinfo
+    records elsewhere, somehow.
+
+    merges with --ignore-ancestry or diff | patch do not require this.
 EOS
   exit 1;
 } else {
@@ -143,7 +151,7 @@ EOS
 sub usage
 {
   warn "@_\n" if @_;
-  die "usage: $0 REPOS TXN-NAME\n";
+  die "usage: $0 REPOS [-r REV] | [-t TXN-NAME]\n";
 }
 
 sub safe_read_from_pipe