From owner-svn-src-all@FreeBSD.ORG  Fri Jan  2 00:02:15 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FD6E106566B;
	Fri,  2 Jan 2009 00:02:15 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CF828FC08;
	Fri,  2 Jan 2009 00:02:15 +0000 (UTC)
	(envelope-from dougb@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 n0202ESI082303;
	Fri, 2 Jan 2009 00:02:14 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0202Ene082302;
	Fri, 2 Jan 2009 00:02:14 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901020002.n0202Ene082302@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 2 Jan 2009 00:02:14 +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: r186688 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2009 00:02:15 -0000

Author: dougb
Date: Fri Jan  2 00:02:14 2009
New Revision: 186688
URL: http://svn.freebsd.org/changeset/base/186688

Log:
  For IGNORE_FILES delete the version in the TEMPROOT, not the base.
  
  Submitted by:	clemens fischer <ino-news@spotteswoode.dnsalias.org>

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

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Thu Jan  1 23:22:01 2009	(r186687)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan  2 00:02:14 2009	(r186688)
@@ -644,7 +644,7 @@ case "${RERUN}" in
 
   # Avoid comparing the following user specified files
   for file in ${IGNORE_FILES}; do
-    test -e ${file} && unlink ${file}
+    test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file}
   done
   ;; # End of the "RERUN" test
 esac