From owner-svn-src-svnadmin@FreeBSD.ORG Wed Nov 12 08:38:39 2014
Return-Path: <owner-svn-src-svnadmin@FreeBSD.ORG>
Delivered-To: svn-src-svnadmin@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 74698A0E;
Wed, 12 Nov 2014 08:38:39 +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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 60456E0A;
Wed, 12 Nov 2014 08:38:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAC8cdvI036968;
Wed, 12 Nov 2014 08:38:39 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAC8cdWj036967;
Wed, 12 Nov 2014 08:38:39 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411120838.sAC8cdWj036967@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Nov 2014 08:38:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-svnadmin@freebsd.org
Subject: svn commit: r274419 - 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-svnadmin@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the admin / configuration tree
<svn-src-svnadmin.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-svnadmin>,
<mailto:svn-src-svnadmin-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-svnadmin/>
List-Post: <mailto:svn-src-svnadmin@freebsd.org>
List-Help: <mailto:svn-src-svnadmin-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-svnadmin>,
<mailto:svn-src-svnadmin-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2014 08:38:39 -0000
Author: gjb
Date: Wed Nov 12 08:38:38 2014
New Revision: 274419
URL: https://svnweb.freebsd.org/changeset/base/274419
Log:
Fix a wording nit in detect-mergeinfo-bloat.pl
Sponsored by: The FreeBSD Foundation
Modified:
svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==============================================================================
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Wed Nov 12 08:36:42 2014 (r274418)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Wed Nov 12 08:38:38 2014 (r274419)
@@ -110,7 +110,7 @@ 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;
- If you use "svn merge" then it must be done at the top directory
+ If you use "svn merge" then it must be done at the top level
directory to prevent spread of mergeinfo records. Resulting
commits must ALSO be done from the root directory.