From owner-svn-src-all@FreeBSD.ORG Tue Aug 27 18:33:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B4704C6; Tue, 27 Aug 2013 18:33:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mail0.glenbarber.us (mail0.glenbarber.us [IPv6:2607:fc50:1:2300:1001:1001:1001:face]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DED72A71; Tue, 27 Aug 2013 18:33:23 +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 E06A1223A; Tue, 27 Aug 2013 18:33:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us E06A1223A Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Tue, 27 Aug 2013 14:33:20 -0400 From: Glen Barber To: Devin Teske Subject: Re: svn commit: r254966 - stable/9/usr.sbin Message-ID: <20130827183320.GZ49310@glenbarber.us> References: <201308271816.r7RIGooN060152@svn.freebsd.org> <20130827182700.GY49310@glenbarber.us> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pqZtgxSH0iQu6R78" Content-Disposition: inline In-Reply-To: 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 18:33:23 -0000 --pqZtgxSH0iQu6R78 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 27, 2013 at 11:29:28AM -0700, Devin Teske wrote: >=20 > On Aug 27, 2013, at 11:27 AM, Glen Barber wrote: >=20 > > 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: https://urldefense.proofpoint.com/v1/url?u=3Dhttp://svnweb.freebs= d.org/changeset/base/254966&k=3D%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=3DMrj= s6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=3Dliaz95fhD2jvIKdlVPU7U5L5wSUmvhBIn55r4k= CXnMQ%3D%0A&s=3Dc379f1e4272fc0b90042e434234eaeb4a6ec9a169fefc38babe82b5556c= dd358 > >>=20 > >> Log: > >> Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 = 253169 > >>=20 > >> Modified: > >> Directory Properties: > >> stable/9/usr.sbin/ (props changed) > >> stable/9/usr.sbin/Makefile (props changed) > >> stable/9/usr.sbin/bsdconfig/ (props changed) > >=20 > > 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. > >=20 >=20 > But but... >=20 > (first... apologies) >=20 > For clarification... >=20 > How exactly would someone merge the mergeinfo for the usr.sbin/Makefile? >=20 > In a separate commit? That seems (not arguing... but...) seems counter-in= tuitive > to require so much churn for a touch-up. >=20 > Despite the fact that the commit was done in usr.sbin... >=20 > The *merges* were actually done at the right level. You are right. Sorry for the noise. I misread the commit list referenced in the log. Glen --pqZtgxSH0iQu6R78 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBCAAGBQJSHPDwAAoJEFJPDDeguUaj+n4IAKbk5dnFsfDmt3fvy3pzODRc cmbM8wQ+67V+iajpUoLhI6m+GieY09AclVonGbZOVrTxytaNWeQKe3a5TtEUXEis SAmNlfbmdBYG9gQXYtIpa9/KY7WbErPCa9BL87o/sf2ptj47TP1HUaQ1s/dez7B/ ae4fSdOmBf3xal3SrhSKj24AuySbKMMnEB7iQyC3N2/EMtaXArBxZmIp/oIxp4DL QcyXC/0h6bYRxOrFss34hclaF/ooKtGjnibkuUvYTurBuCSsqmHAuPb0oSsEqtyi 5X6H7ss4QiGsuNFQU5X5C6v3imTLybK8F3AG1IAvmzGCw0NerCgmpY9Jy84QPUg= =Ziwv -----END PGP SIGNATURE----- --pqZtgxSH0iQu6R78--