Date: Mon, 16 Jan 2012 00:41:04 +0200 From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r230174 - stable/8/sys/kern Message-ID: <4F135600.1090004@FreeBSD.org> In-Reply-To: <4F1354FA.1070300@FreeBSD.org> References: <201201152218.q0FMIsMS003166@svn.freebsd.org> <4F1354FA.1070300@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F135600.1090004>