From owner-svn-src-all@FreeBSD.ORG Fri Jan 22 19:22:37 2010 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20103106566C; Fri, 22 Jan 2010 19:22:37 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw0.york.ac.uk (mail-gw0.york.ac.uk [144.32.128.245]) by mx1.freebsd.org (Postfix) with ESMTP id 9F5DB8FC0A; Fri, 22 Jan 2010 19:22:36 +0000 (UTC) Received: from mail-gw7.york.ac.uk (mail-gw7.york.ac.uk [144.32.129.30]) by mail-gw0.york.ac.uk (8.13.6/8.13.6) with ESMTP id o0MJMXug018203; Fri, 22 Jan 2010 19:22:33 GMT Received: from ury.york.ac.uk ([144.32.108.81]) by mail-gw7.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1NYP5V-0002js-Fu; Fri, 22 Jan 2010 19:22:33 +0000 Received: from ury.york.ac.uk (localhost.york.ac.uk [127.0.0.1]) by ury.york.ac.uk (8.14.3/8.14.3) with ESMTP id o0MJMX4l095554; Fri, 22 Jan 2010 19:22:33 GMT (envelope-from gavin@FreeBSD.org) Received: from localhost (gavin@localhost) by ury.york.ac.uk (8.14.3/8.14.3/Submit) with ESMTP id o0MJMXKj095547; Fri, 22 Jan 2010 19:22:33 GMT (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: ury.york.ac.uk: gavin owned process doing -bs Date: Fri, 22 Jan 2010 19:22:33 +0000 (GMT) From: Gavin Atkinson X-X-Sender: gavin@ury.york.ac.uk To: Doug Barton In-Reply-To: <4B59E591.2010808@FreeBSD.org> Message-ID: References: <201001171110.o0HBAPmc002877@svn.freebsd.org> <4B59E591.2010808@FreeBSD.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org 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: r202464 - stable/8/etc/rc.d X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2010 19:22:37 -0000 On Fri, 22 Jan 2010, Doug Barton wrote: > On 1/17/2010 3:10 AM, Gavin Atkinson wrote: > > Author: gavin > > Date: Sun Jan 17 11:10:24 2010 > > New Revision: 202464 > > URL: http://svn.freebsd.org/changeset/base/202464 > > > > Log: > > Merge r201440, r201445 from head: > > FYI, all merges to things under etc/ should happen in etc/, not in > directories below it. Mergeinfo for this commit (and the one in > stable/7) needs to be pulled up. OK, I'll see what I can do, although I may not get a chance until Sunday. Should this be documented on http://wiki.freebsd.org/SubversionPrimer/Merging? Thanks, Gavin