From owner-cvs-src-old@FreeBSD.ORG  Fri Jan  9 11:21:08 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 41FF61065678
	for <cvs-src-old@freebsd.org>; Fri,  9 Jan 2009 11:21:08 +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 2F4D38FC12
	for <cvs-src-old@freebsd.org>; Fri,  9 Jan 2009 11:21:08 +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 n09BL85n017530
	for <cvs-src-old@freebsd.org>; Fri, 9 Jan 2009 11:21:08 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n09BL80a017529
	for cvs-src-old@freebsd.org; Fri, 9 Jan 2009 11:21:08 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200901091121.n09BL80a017529@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: Fri, 9 Jan 2009 11:20:51 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 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: Fri, 09 Jan 2009 11:21:08 -0000

dougb       2009-01-09 11:20:51 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  SVN rev 186937 on 2009-01-09 11:20:51Z by dougb
  
  MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,
  and 186677:186749:
  
  o Removal of 184781, 184804, and 184832 (automatic installation of files
  that differ only by VCS Id)
  o Fix cross-platform builds
  o Various improvements to the mtree (-U) feature
  o Remove the last of the MAKEDEV stuff
  o 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.
  o Check for the deprecated 'nodev' option in /etc/fstab
  o Add support for the IGNORE_FILES variable
  o Before installing a file check to make sure that the target does not
  already exist as a directory
  o Check to be sure that the file installed and error out if not
  o We only need to check for the presence of the target of $PAGER
  if that variable is actually set
  
  Revision  Changes    Path
  1.36.2.1  +42 -19    src/usr.sbin/mergemaster/mergemaster.8
  1.54.2.2  +94 -52    src/usr.sbin/mergemaster/mergemaster.sh