From owner-svn-src-stable-8@FreeBSD.ORG Sat Nov 27 00:05:18 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 7603A1065679; Sat, 27 Nov 2010 00:05:18 +0000 (UTC) (envelope-from mj@feral.com) Received: from ns1.feral.com (ns1.feral.com [192.67.166.1]) by mx1.freebsd.org (Postfix) with ESMTP id 379F88FC1B; Sat, 27 Nov 2010 00:05:17 +0000 (UTC) Received: from [192.168.221.2] (remotevpn [192.168.221.2]) by ns1.feral.com (8.14.4/8.14.3) with ESMTP id oAR05FUt012043 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 26 Nov 2010 16:05:16 -0800 (PST) (envelope-from mj@feral.com) Message-ID: <4CF04B37.4070606@feral.com> Date: Fri, 26 Nov 2010 16:05:11 -0800 From: Matthew Jacob Organization: Feral Software User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: Kostik Belousov References: <201011261621.oAQGLiI0054302@svn.freebsd.org> <20101126163842.GB2392@deviant.kiev.zoral.com.ua> <4CF0080C.2080003@feral.com> <20101126194600.GC2392@deviant.kiev.zoral.com.ua> In-Reply-To: <20101126194600.GC2392@deviant.kiev.zoral.com.ua> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.2.6 (ns1.feral.com [192.168.221.1]); Fri, 26 Nov 2010 16:05:17 -0800 (PST) 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: Sat, 27 Nov 2010 00:05:18 -0000 Well, the diff was -c-209704. But you're right, I still see this in the merge record. Sigh. On 11/26/2010 11:46 AM, Kostik Belousov wrote: > 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 >> nothing changed. I'm undoing that so I can do it right. This is the >> reason why the geom multipath stuff ended up totally broken in 8.1 even >> though I though I had merged it. >> >> 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.