From owner-svn-src-all@FreeBSD.ORG Fri Feb 10 09:42:26 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 05519106564A; Fri, 10 Feb 2012 09:42:26 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-150-251.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 9286614E91E; Fri, 10 Feb 2012 09:42:25 +0000 (UTC) Message-ID: <4F34E681.3050105@FreeBSD.org> Date: Fri, 10 Feb 2012 01:42:25 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:10.0) Gecko/20120201 Thunderbird/10.0 MIME-Version: 1.0 To: Baptiste Daroussin References: <201202091416.q19EGenl004705@svn.freebsd.org> In-Reply-To: <201202091416.q19EGenl004705@svn.freebsd.org> X-Enigmail-Version: 1.3.5 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: r231278 - in stable/8: etc/rc.d sbin/dhclient 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, 10 Feb 2012 09:42:26 -0000 ALWAYS ALWAYS ALWAYS merge things in /etc in foo/etc. You should have known this because you thoroughly read http://wiki.freebsd.org/SubversionPrimer, especially the section on merging. Your mentor should have told you this, and ensured that you were doing it right when he reviewed your diff. On 02/09/2012 06:16, Baptiste Daroussin wrote: > Author: bapt > Date: Thu Feb 9 14:16:40 2012 > New Revision: 231278 > URL: http://svn.freebsd.org/changeset/base/231278 > > Log: > MFH r226345, r226464, r226879: > Make dhclient use a pid file. Modify the rc script accordingly, fix some bugs > > Approved by: des (mentor) -- It's always a long day; 86400 doesn't fit into a short. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/