From owner-cvs-src-old@FreeBSD.ORG  Wed Dec 30 23:14:28 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 7F2071065698
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:14:28 +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 6C6F18FC27
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:14:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBUNES3i056372
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:14:28 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBUNESil056371
	for cvs-src-old@freebsd.org; Wed, 30 Dec 2009 23:14:28 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200912302314.nBUNESil056371@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: Wed, 30 Dec 2009 23:14:03 +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: Wed, 30 Dec 2009 23:14:28 -0000

dougb       2009-12-30 23:14:03 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 201291 on 2009-12-30 23:14:03Z by dougb
  
  Add some patches contributed by jhb:
  1. Don't prompt the user for "-U but no db" error if we're using -a
  2. Add an option to delete stale rc.d files automatically if the user
  has DELETE_STALE_RC_FILES in their rc file. Lack of command line option
  for this is not an oversight.
  3. Add []'s around the terminal $ for the $FreeBSD$ test for -F
  
  For one bug raised by jhb I did a more thorough solution:
  There were a lot of things that "snuck in" between the end of the test
  for -r and the start of the comparison. One of them is the creation of
  the mtree db, as pointed out by jhb. Fix this problem more thoroughly
  by moving the end of the test down to where it should/used to be, right
  before the comparison. As a result, indent the interloping code to match.
  
  Revision  Changes    Path
  1.78      +36 -25    src/usr.sbin/mergemaster/mergemaster.sh