From owner-cvs-all@FreeBSD.ORG Fri May 2 15:33:55 2003 Return-Path: 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 4E2B137B401; Fri, 2 May 2003 15:33:55 -0700 (PDT) Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F05F43F85; Fri, 2 May 2003 15:33:54 -0700 (PDT) (envelope-from DougB@freebsd.org) Received: from master.dougb.net (12-234-22-23.client.attbi.com[12.234.22.23]) by rwcrmhc51.attbi.com (rwcrmhc51) with SMTP id <200305022233530510032aere>; Fri, 2 May 2003 22:33:53 +0000 Date: Fri, 2 May 2003 15:33:49 -0700 (PDT) From: Doug Barton To: Dag-Erling Smorgrav In-Reply-To: Message-ID: <20030502152842.Y12694@znfgre.qbhto.arg> References: <200305020626.h426QNT4044532@repoman.freebsd.org> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 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: Fri, 02 May 2003 22:33:55 -0000 On Fri, 2 May 2003, Dag-Erling Smorgrav wrote: > Doug Barton writes: > > * Add a -P (Preserve) option, which saves a copy of files that you replace. > > The idea for this option came from Marc Schneiders > > This should be the default... I don't necessarily disagree with you, but I wanted people to have some experience with it first. You can of course make it the default in your mergemaster rc file if you choose. > > * Replace the above with a check for elements of the old rc system. > > Offer to move these files out of DESTDIR/etc for the user's convenience. > > How about a more generic mechanism that lists files which exist in > DESTDIR but not in TEMPROOT and offers to remove / rename them? mergemaster -v will give you the list. If you actually run that, you'll see the problem I think. Too many files that actually do belong, but aren't created by src/etc/Makefile (and therefore mergemaster doesn't "know" about them). In order to make what you're suggesting really worthwhile, mergemaster would have to grow a lot of knowledge about specific files, and that knowledge would have to be maintained, dealt with across upgrade boundaries, etc. This is something I've opposed in the past for reasons I've articulated several times, and should be available in the archives. Doug -- This .signature sanitized for your protection