From owner-svn-src-all@FreeBSD.ORG  Sat Dec  7 18:55:54 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 21BF6EEB;
 Sat,  7 Dec 2013 18:55:54 +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 0EAAA1240;
 Sat,  7 Dec 2013 18:55:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7ItrFc081096;
 Sat, 7 Dec 2013 18:55:53 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7ItrDL081095;
 Sat, 7 Dec 2013 18:55:53 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201312071855.rB7ItrDL081095@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 7 Dec 2013 18:55:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-svnadmin@freebsd.org
Subject: svn commit: r259078 - svnadmin/hooks
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:55:54 -0000

Author: peter
Date: Sat Dec  7 18:55:53 2013
New Revision: 259078
URL: http://svnweb.freebsd.org/changeset/base/259078

Log:
  Check for mergeinfo growth on stable/10+.

Modified:
  svnadmin/hooks/pre-commit

Modified: svnadmin/hooks/pre-commit
==============================================================================
--- svnadmin/hooks/pre-commit	Sat Dec  7 18:53:54 2013	(r259077)
+++ svnadmin/hooks/pre-commit	Sat Dec  7 18:55:53 2013	(r259078)
@@ -87,6 +87,9 @@ verify.py "$REPO" -t "$TXN" || exit 1
 # check for merge debris
 detect-merge-conflicts.sh "$REPO" "$TXN" || exit 1
 
+# stomp on mergeinfo bloat
+detect-mergeinfo-bloat.pl "$REPO" -t "$TXN" || exit 1
+
 # check for upper/lowercase filename conflicts on clients
 case-insensitive.py "$REPO" "$TXN" || exit 1
 
@@ -95,16 +98,3 @@ log-police.py -t "$TXN" "$REPO" || exit 
 
 # Nothing else, go ahead.
 exit 0
-
-
-# Make sure that the log message contains some text.
-SVNLOOK=/usr/local/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPO" | \
-   grep "[a-zA-Z0-9]" > /dev/null || exit 1
-
-# Check that the author of this commit has the rights to perform
-# the commit on the files and directories being modified.
-commit-access-control.pl "$REPO" "$TXN" commit-access-control.cfg || exit 1
-
-# All checks passed, so allow the commit.
-exit 0