From owner-cvs-src-old@FreeBSD.ORG  Fri Jan  8 00:05:20 2010
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 55ED11065695
	for <cvs-src-old@freebsd.org>; Fri,  8 Jan 2010 00:05:19 +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 CCAC68FC0A
	for <cvs-src-old@freebsd.org>; Fri,  8 Jan 2010 00:05:19 +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 o0805JQs051525
	for <cvs-src-old@freebsd.org>; Fri, 8 Jan 2010 00:05:19 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0805JV4051524
	for cvs-src-old@freebsd.org; Fri, 8 Jan 2010 00:05:19 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201001080005.o0805JV4051524@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, 8 Jan 2010 00:05:10 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
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, 08 Jan 2010 00:05:20 -0000

dougb       2010-01-08 00:05:10 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  SVN rev 201765 on 2010-01-08 00:05:10Z by dougb
  
  Update copyright date
  
  Update delete_temproot() to include the error message if it fails,
  and clean up the places where it's called.
  
  If there are no files left in temproot when the comparison is done
  delete it without prompting. This should make "automated" runs of
  mergemaster without -a a little easier.
  
  Document the new behavior in the man page.
  
  Revision  Changes    Path
  1.44      +10 -2     src/usr.sbin/mergemaster/mergemaster.8
  1.80      +20 -22    src/usr.sbin/mergemaster/mergemaster.sh