Date: Fri, 10 Feb 2012 01:42:25 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Baptiste Daroussin <bapt@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: r231278 - in stable/8: etc/rc.d sbin/dhclient Message-ID: <4F34E681.3050105@FreeBSD.org> In-Reply-To: <201202091416.q19EGenl004705@svn.freebsd.org> References: <201202091416.q19EGenl004705@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F34E681.3050105>