From owner-svn-src-stable@FreeBSD.ORG Fri Oct 22 00:12:41 2010 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 4EF36106564A; Fri, 22 Oct 2010 00:12:41 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id F3AA78FC19; Fri, 22 Oct 2010 00:12:40 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.4/8.14.4) with ESMTP id o9LNVmxv089945; Thu, 21 Oct 2010 16:31:48 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.4/8.14.4/Submit) id o9LNVm2N089944; Thu, 21 Oct 2010 16:31:48 -0700 (PDT) (envelope-from obrien) Date: Thu, 21 Oct 2010 16:31:48 -0700 From: "David O'Brien" To: Jilles Tjoelker Message-ID: <20101021233148.GA89895@dragon.NUXI.org> References: <201010210113.o9L1Df79074263@svn.freebsd.org> <20101021205116.GA58084@stack.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101021205116.GA58084@stack.nl> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.16 (2007-06-09) 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: r214123 - stable/8/bin/sh X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org 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: Fri, 22 Oct 2010 00:12:41 -0000 On Thu, Oct 21, 2010 at 10:51:16PM +0200, Jilles Tjoelker wrote: > On Thu, Oct 21, 2010 at 01:13:41AM +0000, David E. O'Brien wrote: > > MFC > > r213925: use rather than > > Hmm, it looks like this was not merged except for adding the mergeinfo. Hi Jilles, You are correct. Doing a merge of that results in a meaningless situation as the base isn't there.conflict. So I am blocking that particular revision from being a merge candidate and that could be merged in the future. http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.blockchanges -- -- David (obrien@FreeBSD.org)