From owner-svn-src-stable@FreeBSD.ORG Tue Aug 27 18:27:04 2013 Return-Path: Delivered-To: svn-src-stable@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 ESMTP id 0CED178; Tue, 27 Aug 2013 18:27:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1A2A29E6; Tue, 27 Aug 2013 18:27:03 +0000 (UTC) Received: from glenbarber.us (unknown [IPv6:2001:470:8:1205:3119:eb32:14c4:b83a]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id 3170521BE; Tue, 27 Aug 2013 18:27:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 3170521BE Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Tue, 27 Aug 2013 14:27:00 -0400 From: Glen Barber To: Devin Teske Subject: Re: svn commit: r254966 - stable/9/usr.sbin Message-ID: <20130827182700.GY49310@glenbarber.us> References: <201308271816.r7RIGooN060152@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5Y5y2FX8vnqwSxRu" Content-Disposition: inline In-Reply-To: <201308271816.r7RIGooN060152@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 18:27:04 -0000 --5Y5y2FX8vnqwSxRu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 27, 2013 at 06:16:50PM +0000, Devin Teske wrote: > Author: dteske > Date: Tue Aug 27 18:16:50 2013 > New Revision: 254966 > URL: http://svnweb.freebsd.org/changeset/base/254966 >=20 > Log: > Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 25= 3169 >=20 > Modified: > Directory Properties: > stable/9/usr.sbin/ (props changed) > stable/9/usr.sbin/Makefile (props changed) > stable/9/usr.sbin/bsdconfig/ (props changed) This is wrong. usr.sbin should never be a merge target. The correct merge targets in this case are usr.sbin/bsdconfig/share and usr.sbin/bsdconfig. Glen --5Y5y2FX8vnqwSxRu Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBCAAGBQJSHO90AAoJEFJPDDeguUaje+wIALTQ+JQROx3hzQ1mB51VUft3 Vm6PPWGzDtyBzYibOEjQEr8QerAnVyGrRznnbfz6BK11ppZBrZg3IH9D9S2ns+vh bWHMDBrcPzShqBQWi33jLYCWIsE/1M5v8PWAGHW+z4ZeM5yZjPaIm0oZfeZYPMdc pqWIU43Sr2c6uvJYHbGnquq9DHjewJwZ8Q7y/2MKxjFk5E3Ptx4/mL+iIPrm3u17 aXfBMV76redHbtAMwSNWjfwugcuPx0gzdnEI/E0W/OdtKnZNJr+KB6Bn4nY0DvMS UEn+Yxrt90SJozCe4MD6pPrKCvT5HHklrkVfjWuTI6wD+tOAC0WbZY5Rz7gjOGU= =N3i+ -----END PGP SIGNATURE----- --5Y5y2FX8vnqwSxRu--