Date: Fri, 26 Nov 2010 21:46:00 +0200 From: Kostik Belousov <kostikbel@gmail.com> To: Matthew Jacob <mj@feral.com> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Matt Jacob <mjacob@freebsd.org> Subject: Re: svn commit: r215873 - stable/8/sbin/geom/class/sched Message-ID: <20101126194600.GC2392@deviant.kiev.zoral.com.ua> In-Reply-To: <4CF0080C.2080003@feral.com> References: <201011261621.oAQGLiI0054302@svn.freebsd.org> <20101126163842.GB2392@deviant.kiev.zoral.com.ua> <4CF0080C.2080003@feral.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--x27i3C0R2RWFKbZk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 26, 2010 at 11:18:36AM -0800, Matthew Jacob wrote: > Something like that. 209704 got itself recorded as merged from head. But= =20 > nothing changed. I'm undoing that so I can do it right. This is the=20 > reason why the geom multipath stuff ended up totally broken in 8.1 even= =20 > though I though I had merged it. >=20 > Or have I missed something? Might be I am confused as well, but r215873 did not reverted recording of the merge of r209704. Instead, the r215873 is revision that seem to recorded it as merged. >=20 > On 11/26/2010 8:38 AM, Kostik Belousov wrote: > >On Fri, Nov 26, 2010 at 04:21:44PM +0000, Matt Jacob wrote: > >>Author: mjacob > >>Date: Fri Nov 26 16:21:44 2010 > >>New Revision: 215873 > >>URL: http://svn.freebsd.org/changeset/base/215873 > >> > >>Log: > >> Revert a completely fouled up merge. > >> > >>Modified: > >>Directory Properties: > >> stable/8/sbin/geom/ (props changed) > >> stable/8/sbin/geom/class/part/ (props changed) > >> stable/8/sbin/geom/class/sched/gsched.8 (props changed) > >> stable/8/sbin/geom/class/stripe/ (props changed) > >Is this a revert ? The commit looks as a record of the merge of > >r209704, that in fact did not happen ? --x27i3C0R2RWFKbZk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAkzwDngACgkQC3+MBN1Mb4ggDwCgvG8lDwgS3X5zB91EekcEi80m lkgAn39uvwysdY2waPSKRQEIXdsHxMgS =Cl3x -----END PGP SIGNATURE----- --x27i3C0R2RWFKbZk--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101126194600.GC2392>