From owner-cvs-all@FreeBSD.ORG  Thu May  1 23:26:24 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 8EB1937B401; Thu,  1 May 2003 23:26:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2AFE943FAF; Thu,  1 May 2003 23:26:24 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h426QN0U044533;
	Thu, 1 May 2003 23:26:23 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h426QNT4044532;
	Thu, 1 May 2003 23:26:23 -0700 (PDT)
Message-Id: <200305020626.h426QNT4044532@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 1 May 2003 23:26:23 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: 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 06:26:25 -0000

dougb       2003/05/01 23:26:23 PDT

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  * 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>
  
  * I've been meaning to remove the code that checked for the existence of
  /etc/sysconfig for a while now, since that file was last seen in 2.2.2.
  
  * 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.
  
  Revision  Changes    Path
  1.44      +50 -20    src/usr.sbin/mergemaster/mergemaster.sh