From owner-svn-src-stable-8@FreeBSD.ORG Fri Nov 26 19:46:10 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66C2310656AB; Fri, 26 Nov 2010 19:46:10 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id CBEF88FC08; Fri, 26 Nov 2010 19:46:09 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id oAQJk1QY062659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 26 Nov 2010 21:46:01 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id oAQJk1ex037794; Fri, 26 Nov 2010 21:46:01 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id oAQJk0Pw037793; Fri, 26 Nov 2010 21:46:00 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 26 Nov 2010 21:46:00 +0200 From: Kostik Belousov To: Matthew Jacob Message-ID: <20101126194600.GC2392@deviant.kiev.zoral.com.ua> References: <201011261621.oAQGLiI0054302@svn.freebsd.org> <20101126163842.GB2392@deviant.kiev.zoral.com.ua> <4CF0080C.2080003@feral.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="x27i3C0R2RWFKbZk" Content-Disposition: inline In-Reply-To: <4CF0080C.2080003@feral.com> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Matt Jacob Subject: Re: svn commit: r215873 - stable/8/sbin/geom/class/sched X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2010 19:46:10 -0000 --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--