From owner-svn-src-stable@FreeBSD.ORG Sun Jan 15 22:42:06 2012 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 04A4D106566C; Sun, 15 Jan 2012 22:42:06 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id D6AFD14DC1A; Sun, 15 Jan 2012 22:42:04 +0000 (UTC) Message-ID: <4F13563C.8060108@FreeBSD.org> Date: Sun, 15 Jan 2012 14:42:04 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: Andriy Gapon References: <201201152218.q0FMIsMS003166@svn.freebsd.org> <4F1354FA.1070300@FreeBSD.org> In-Reply-To: <4F1354FA.1070300@FreeBSD.org> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org 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:42:06 -0000 On 01/15/2012 14:36, Andriy Gapon wrote: > 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. I'm pretty sure that after you've edited the file you want mine-full there, but the options to --accept confuse me as well (FWIW). hth, Doug -- You can observe a lot just by watching. -- Yogi Berra Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/