From owner-svn-src-head@FreeBSD.ORG  Tue Nov 11 02:13:22 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 334EE1065674;
	Tue, 11 Nov 2008 02:13:22 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24DA78FC17;
	Tue, 11 Nov 2008 02:13:22 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAB2DMat088313;
	Tue, 11 Nov 2008 02:13:22 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAB2DMFw088312;
	Tue, 11 Nov 2008 02:13:22 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <200811110213.mAB2DMFw088312@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Tue, 11 Nov 2008 02:13:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184832 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Nov 2008 02:13:22 -0000

Author: sobomax
Date: Tue Nov 11 02:13:21 2008
New Revision: 184832
URL: http://svn.freebsd.org/changeset/base/184832

Log:
  No need to run rm ${COMPFILE} after mm_install() - mm_install()
  does it for us.

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 11 00:32:55 2008	(r184831)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 11 02:13:21 2008	(r184832)
@@ -960,7 +960,6 @@ for COMPFILE in `find . -type f -size +0
         if mm_install "${COMPFILE}"; then
           echo "   *** ${COMPFILE} upgraded successfully"
           echo ''
-          rm "${COMPFILE}"
         else
           echo "   *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
         fi