Date: Tue, 27 Aug 2013 14:27:00 -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: <20130827182700.GY49310@glenbarber.us> In-Reply-To: <201308271816.r7RIGooN060152@svn.freebsd.org> References: <201308271816.r7RIGooN060152@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130827182700.GY49310>