From owner-cvs-src-old@FreeBSD.ORG  Thu Jan  1 11:41:27 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F114106567D
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 11:41:27 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F23AE8FC1A
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 11:41:26 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n01BfQAp005561
	for <cvs-src-old@freebsd.org>; Thu, 1 Jan 2009 11:41:26 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n01BfQLA005560
	for cvs-src-old@freebsd.org; Thu, 1 Jan 2009 11:41:26 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200901011141.n01BfQLA005560@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 1 Jan 2009 11:41:13 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2009 11:41:27 -0000

dougb       2009-01-01 11:41:13 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 186678 on 2009-01-01 11:41:13Z by dougb
  
  Maintenance and updates
  =======================
  1. Various improvements to the mtree (-U) feature:
  a. Seperate the notion of directory and file (user can override db path)
  b. Only check for the existence of the mtree file if -U is set
  c. Use mktemp to create the new version of the file
  d. More safely install the new file
  e. Standardize error messages a bit
  2. Remove the last of the MAKEDEV stuff (RIP)
  
  New Features
  ============
  1. Switch to using the top level (e.g., /usr/src) Makefile, and specify
  that we should use the *.mk files from the source directory instead of
  the installed versions. [1][2] This allows easier cross builds and
  simplifies (or in some cases permits) upgrading.
  2. Check for the deprecated 'nodev' option in /etc/fstab [3]
  3. Add support for the IGNORE_FILES variable [4] and deprecate IGNORE_MOTD
  accordingly.
  4. Before installing a file check to make sure that the target does not
  already exist as a directory [5]
  5. Check to be sure that the file installed and error out if not
  
  PR:             bin/96528 [1]
  Submitted by:   ru [1]
  PR:             bin/129639 [2]
  Submitted by:   sam [2]
  PR:             bin/122282 [3]
  Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3]
  PR:             bin/106642 [4]
  Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk> [4]
  PR:             bin/108183 [5]
  Submitted by:   Riccardo Torrini <riccardo@torrini.org> [5]
  
  Revision  Changes    Path
  1.61      +85 -50    src/usr.sbin/mergemaster/mergemaster.sh