From owner-svn-src-all@FreeBSD.ORG  Fri Nov 26 19:54:41 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EC7D1065670;
	Fri, 26 Nov 2010 19:54:41 +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 AB07F8FC14;
	Fri, 26 Nov 2010 19:54:40 +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 oAQJIe0G026634
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO);
	Fri, 26 Nov 2010 11:18:47 -0800 (PST) (envelope-from mj@feral.com)
Message-ID: <4CF0080C.2080003@feral.com>
Date: Fri, 26 Nov 2010 11:18:36 -0800
From: Matthew Jacob <mj@feral.com>
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 <kostikbel@gmail.com>
References: <201011261621.oAQGLiI0054302@svn.freebsd.org>
	<20101126163842.GB2392@deviant.kiev.zoral.com.ua>
In-Reply-To: <20101126163842.GB2392@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 11:18:48 -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 <mjacob@freebsd.org>
Subject: Re: svn commit: r215873 - stable/8/sbin/geom/class/sched
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Nov 2010 19:54:41 -0000

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?

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 ?