From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 15 23:07:29 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
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 50C0C106564A;
	Sun, 15 Jan 2012 23:07:29 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107])
	by mx1.freebsd.org (Postfix) with ESMTP id AAEC48FC12;
	Sun, 15 Jan 2012 23:07:28 +0000 (UTC)
Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131])
	by mx1.stack.nl (Postfix) with ESMTP id B9EA81DDA7D;
	Mon, 16 Jan 2012 00:07:27 +0100 (CET)
Received: by snail.stack.nl (Postfix, from userid 1677)
	id A11AB28468; Mon, 16 Jan 2012 00:07:27 +0100 (CET)
Date: Mon, 16 Jan 2012 00:07:27 +0100
From: Jilles Tjoelker <jilles@stack.nl>
To: Doug Barton <dougb@FreeBSD.org>
Message-ID: <20120115230727.GA67248@stack.nl>
References: <201201152218.q0FMIsMS003166@svn.freebsd.org>
	<4F1354FA.1070300@FreeBSD.org> <4F13563C.8060108@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4F13563C.8060108@FreeBSD.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org,
	Andriy Gapon <avg@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
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 23:07:29 -0000

On Sun, Jan 15, 2012 at 02:42:04PM -0800, Doug Barton wrote:
> 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).

I think 'mine-full' means you want the version that was in the stable
branch before the MFC.

As shown in 'svn help resolved', the equivalent of 'svn resolved' is
'svn resolve --accept working'. I still prefer 'svn resolved' though as
it is less typing :)

I have also found the questions asked by 'svn merge' to be usable in
many cases.

-- 
Jilles Tjoelker