Date: Thu, 21 Oct 2010 16:31:48 -0700 From: "David O'Brien" <obrien@freebsd.org> To: Jilles Tjoelker <jilles@stack.nl> 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 Message-ID: <20101021233148.GA89895@dragon.NUXI.org> In-Reply-To: <20101021205116.GA58084@stack.nl> References: <201010210113.o9L1Df79074263@svn.freebsd.org> <20101021205116.GA58084@stack.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <stddef.h> rather than <sys/stddef.h> > > 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101021233148.GA89895>