From owner-cvs-all  Mon Oct 30  2:33:56 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 00C1D37B479; Mon, 30 Oct 2000 02:33:52 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id CAA93336;
	Mon, 30 Oct 2000 02:33:51 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Message-Id: <200010301033.CAA93336@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 30 Oct 2000 02:33:51 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh mergemaster.8
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2000/10/30 02:33:51 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.sh mergemaster.8 
  Log:
  Add several new features, reorder some code, and continue with the
  process of making the script more cross platform friendly.
  
  * Add -i option to automatically install files that do not exist
    on the system already.
  * Add the ability to specify DESTDIR.
  * Allow the user to specify scripts to run right before the
    comparison starts, and when mm is done. This will
    allow the user to specify customized local behavior, and
    implement features such as automatically deleting files.
  * Document the above changes in the man page.
  * Switch to using 'ident' for the CVS Id comparison, which
    should help with portability, and makes it faster.
  * Reorder, and in one case fix some code by doing things in
    ways that make more sense.
  * Check to see if the file exists on the system before doing
    the comparisons. This saves CPU cycles, and streamlines
    the auto-install process.
  
  I used bits and pieces of suggestions and patches from various
  people, ultimately too numerous to name. Which is not to say
  that they were not both appreciated, and helpful in achieving
  the ultimate result.
  
  Revision  Changes    Path
  1.14      +137 -92   src/usr.sbin/mergemaster/mergemaster.sh
  1.8       +59 -7     src/usr.sbin/mergemaster/mergemaster.8



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message