From owner-svn-src-stable@FreeBSD.ORG Sun Jan 15 22:53:39 2012 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 346B8106566C; Sun, 15 Jan 2012 22:53:39 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 4B0B38FC08; Sun, 15 Jan 2012 22:53:37 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id AAA11416; Mon, 16 Jan 2012 00:41:05 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1RmYl7-000P8R-5F; Mon, 16 Jan 2012 00:41:05 +0200 Message-ID: <4F135600.1090004@FreeBSD.org> Date: Mon, 16 Jan 2012 00:41:04 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-8@FreeBSD.org References: <201201152218.q0FMIsMS003166@svn.freebsd.org> <4F1354FA.1070300@FreeBSD.org> In-Reply-To: <4F1354FA.1070300@FreeBSD.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Subject: Re: svn commit: r230174 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2012 22:53:39 -0000 on 16/01/2012 00:36 Andriy Gapon said the following: > on 16/01/2012 00:18 Andriy Gapon said the following: >> Author: avg >> Date: Sun Jan 15 22:18:54 2012 >> New Revision: 230174 >> URL: http://svn.freebsd.org/changeset/base/230174 >> >> Log: >> MFC r228718: ule: ensure that batch timeshare threads are scheduled >> fairly > > Apologies, this commit is screwed up. > > What happened. There was a merge conflict. I initially chose the postpone > option. Then edited the file to get a correct merge. Then ran svn resolve. > It complained that it needed --accept option, so I used --accept=base. I didn't > do another svn diff after that before committing the change and that was my > mistake. Apparently svn resolve --accept=base changed the file. A shorter version: I used svn resolve instead of svn resolved and even having to specify the --accept option didn't alert me to my mistake. Sigh. -- Andriy Gapon