From owner-cvs-src-old@FreeBSD.ORG  Tue Jun  9 20:20:26 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 0027A1065814
	for <cvs-src-old@freebsd.org>; Tue,  9 Jun 2009 20:20:25 +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 E14198FC1B
	for <cvs-src-old@freebsd.org>; Tue,  9 Jun 2009 20:20:25 +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 n59KKP3H076439
	for <cvs-src-old@freebsd.org>; Tue, 9 Jun 2009 20:20:25 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n59KKP9G076438
	for cvs-src-old@freebsd.org; Tue, 9 Jun 2009 20:20:25 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200906092020.n59KKP9G076438@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: Tue, 9 Jun 2009 20:20:08 +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: Tue, 09 Jun 2009 20:20:26 -0000

dougb       2009-06-09 20:20:08 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 193853 on 2009-06-09 20:20:08Z by dougb
  
  1. Update the message that prints out for -U when the mtree database does
  not exist to let the user know that it will be created for the next run.
  
  2. Delete more stuff we're not going to use from the temproot prior to
  creating the mtree database to dramatically reduce its size (162K -> 37K).
  
  3. We've been deleting the zero-size files from temproot for a long time
  now, so remove the spurious "-size +0" from the find command in the
  comparison loop, and remove what is now a really stale comment.
  
  Revision  Changes    Path
  1.72      +7 -7      src/usr.sbin/mergemaster/mergemaster.sh