From owner-cvs-all@FreeBSD.ORG  Fri May  2 07:44:42 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 C286E37B401; Fri,  2 May 2003 07:44:42 -0700 (PDT)
Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1015443F75; Fri,  2 May 2003 07:44:42 -0700 (PDT)
	(envelope-from des@ofug.org)
Received: by flood.ping.uio.no (Postfix, from userid 2602)
	id A5F40530E; Fri,  2 May 2003 16:44:40 +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: Fri, 02 May 2003 16:44:40 +0200
In-Reply-To: <200305020626.h426QNT4044532@repoman.freebsd.org> (Doug
 Barton's message of "Thu, 1 May 2003 23:26:23 -0700 (PDT)")
Message-ID: <xzpel3h8l2f.fsf@flood.ping.uio.no>
User-Agent: Gnus/5.090015 (Oort Gnus v0.15) Emacs/21.3
References: <200305020626.h426QNT4044532@repoman.freebsd.org>
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 14:44:43 -0000

Doug Barton <dougb@FreeBSD.org> writes:
>   * Add a -P (Preserve) option, which saves a copy of files that you replace.
>   The idea for this option came from Marc Schneiders <marc@schneiders.org>

This should be the default...

>   * 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?

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