From owner-cvs-all@FreeBSD.ORG Sun Jan 22 07:54:18 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9188916A41F; Sun, 22 Jan 2006 07:54:18 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2680443D46; Sun, 22 Jan 2006 07:54:13 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.3/8.13.3) with ESMTP id k0M7s7Pm092178; Sun, 22 Jan 2006 10:54:07 +0300 (MSK) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.3/8.13.3/Submit) id k0M7s7TV092177; Sun, 22 Jan 2006 10:54:07 +0300 (MSK) (envelope-from yar) Date: Sun, 22 Jan 2006 10:54:07 +0300 From: Yar Tikhiy To: Gleb Smirnoff Message-ID: <20060122075406.GB91663@comp.chem.msu.su> References: <200601212251.k0LMpeom029908@repoman.freebsd.org> <20060121233937.GC83922@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060121233937.GC83922@FreeBSD.org> User-Agent: Mutt/1.5.9i Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src ObsoleteFiles.inc UPDATING X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2006 07:54:18 -0000 On Sun, Jan 22, 2006 at 02:39:37AM +0300, Gleb Smirnoff wrote: > On Sat, Jan 21, 2006 at 10:51:40PM +0000, Yar Tikhiy wrote: > Y> yar 2006-01-21 22:51:40 UTC > Y> > Y> FreeBSD src repository > Y> > Y> Modified files: (Branch: RELENG_6) > Y> . ObsoleteFiles.inc UPDATING > Y> Log: > Y> MFC: > Y> Record renaming rc.d/ppp-user to rc.d/ppp. > Y> > Y> Revision Changes Path > Y> 1.25.2.2 +2 -0 src/ObsoleteFiles.inc > Y> 1.416.2.14 +5 -0 src/UPDATING > > If I don't mistake, when this thins was committed to HEAD, > someone noticed, that /etc is mergemaster's area, and > files from /etc should not be listed in ObsoleteFiles.inc. There are quite a few /etc files still listed in ObsoleteFiles.inc. Was there a consensus on this issue? In my opinion, mergemaster just predated ObsoleteFiles.inc in this area. We are trying to make /etc contents uniform across different installations, with local configuration files going to /usr/local/etc, so there's nothing wrong in listing defunct /etc files in ObsoleteFiles.inc. -- Yar