From owner-cvs-all@FreeBSD.ORG  Fri May  2 15:54:29 2003
Return-Path: <owner-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 D236537B401; Fri,  2 May 2003 15:54:29 -0700 (PDT)
Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E41FB43FA3; Fri,  2 May 2003 15:54:28 -0700 (PDT)
	(envelope-from des@ofug.org)
Received: by flood.ping.uio.no (Postfix, from userid 2602)
	id D32C8530E; Sat,  3 May 2003 00:54:26 +0200 (CEST)
X-URL: http://www.ofug.org/~des/
X-Disclaimer: The views expressed in this message do not necessarily
  coincide with those of any organisation or company with
  which I am or have been affiliated.
To: Doug Barton <DougB@FreeBSD.org>
From: Dag-Erling Smorgrav <des@ofug.org>
Date: Sat, 03 May 2003 00:54:24 +0200
In-Reply-To: <20030502152842.Y12694@znfgre.qbhto.arg> (Doug Barton's message
 of "Fri, 2 May 2003 15:33:49 -0700 (PDT)")
Message-ID: <xzpfznxkli7.fsf@flood.ping.uio.no>
User-Agent: Gnus/5.090015 (Oort Gnus v0.15) Emacs/21.3
References: <200305020626.h426QNT4044532@repoman.freebsd.org>
	<xzpel3h8l2f.fsf@flood.ping.uio.no>
	<20030502152842.Y12694@znfgre.qbhto.arg>
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 <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2003 22:54:30 -0000

Doug Barton <DougB@FreeBSD.org> writes:
> On Fri, 2 May 2003, Dag-Erling Smorgrav wrote:
> > 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).

What you could do is the following:

  **** $DESTDIR/etc/xxxx does not exist in TEMPROOT

  Use 'd' to delete $DESTDIR/etc/xxxx
  Use 'k' to keep $DESTDIR/etc/xxx and never ask about it again

  Default is to leave the file to deal with by hand

How should I deal with this? [Leave it for later]

then if the user presses 'k', record the file name in the mm rc file
and the next time mm trips over it it will be ignored.

DES
-- 
Dag-Erling Smorgrav - des@ofug.org