From owner-cvs-src-old@FreeBSD.ORG  Sat May 16 22:22:46 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 62362106564A
	for <cvs-src-old@freebsd.org>; Sat, 16 May 2009 22:22:46 +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 5191A8FC0A
	for <cvs-src-old@freebsd.org>; Sat, 16 May 2009 22:22:46 +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 n4GMMk5W092837
	for <cvs-src-old@freebsd.org>; Sat, 16 May 2009 22:22:46 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GMMkDe092836
	for cvs-src-old@freebsd.org; Sat, 16 May 2009 22:22:46 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200905162222.n4GMMkDe092836@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: Sat, 16 May 2009 22:22:31 +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: Sat, 16 May 2009 22:22:46 -0000

dougb       2009-05-16 22:22:31 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 192230 on 2009-05-16 22:22:31Z by dougb
  
  Enhance the safety of the -U option:
  1. In several places make sure that the mtree database is not empty using
  the -s argument to test instead of -f. (I thought I'd already changed this,
  but obviously not.)
  2. When deriving the list of changed files use a colon-delimited list.
  3. If the list of changed files is empty, unset the variable, and test
  for a non-empty CHANGED in diff_loop() before entering that routine.
  
  Enhance the speed of the -U option by using an internal case statement
  instead of echoing the variable to an external grep for every file.
  
  Fix indentation on one line.
  
  Revision  Changes    Path
  1.71      +13 -9     src/usr.sbin/mergemaster/mergemaster.sh