Date: Tue, 27 Aug 2013 14:33:20 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Devin Teske <dteske@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r254966 - stable/9/usr.sbin Message-ID: <20130827183320.GZ49310@glenbarber.us> In-Reply-To: <A35984E9-A7AA-46F2-A989-486C9FE5E55A@vicor.com> References: <201308271816.r7RIGooN060152@svn.freebsd.org> <20130827182700.GY49310@glenbarber.us> <A35984E9-A7AA-46F2-A989-486C9FE5E55A@vicor.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Aug 27, 2013 at 11:29:28AM -0700, Devin Teske wrote: > > On Aug 27, 2013, at 11:27 AM, Glen Barber wrote: > > > 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=http://svnweb.freebsd.org/changeset/base/254966&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=liaz95fhD2jvIKdlVPU7U5L5wSUmvhBIn55r4kCXnMQ%3D%0A&s=c379f1e4272fc0b90042e434234eaeb4a6ec9a169fefc38babe82b5556cdd358 > >> > >> Log: > >> Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 253169 > >> > >> 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. > > > > But but... > > (first... apologies) > > For clarification... > > How exactly would someone merge the mergeinfo for the usr.sbin/Makefile? > > In a separate commit? That seems (not arguing... but...) seems counter-intuitive > to require so much churn for a touch-up. > > Despite the fact that the commit was done in usr.sbin... > > 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 [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130827183320.GZ49310>