From owner-svn-src-head@FreeBSD.ORG  Sun Nov  9 23:44:32 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 883841065680;
	Sun,  9 Nov 2008 23:44:32 +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 7F54D8FC08;
	Sun,  9 Nov 2008 23:44:32 +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 mA9NiWeJ053451;
	Sun, 9 Nov 2008 23:44:32 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA9NiW6g053450;
	Sun, 9 Nov 2008 23:44:32 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <200811092344.mA9NiW6g053450@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Sun, 9 Nov 2008 23:44:32 +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: r184804 - 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: Sun, 09 Nov 2008 23:44:32 -0000

Author: sobomax
Date: Sun Nov  9 23:44:32 2008
New Revision: 184804
URL: http://svn.freebsd.org/changeset/base/184804

Log:
  Improve on 184781 - instead of ignoring the file when the only difference
  is CVS Id, replace the old one with the new one automatically. While I
  don't see much difference, some people think it's somehow better that way.

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

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Sun Nov  9 20:36:13 2008	(r184803)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Sun Nov  9 23:44:32 2008	(r184804)
@@ -956,8 +956,14 @@ for COMPFILE in `find . -type f -size +0
       sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}"
       if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \
         /dev/null 2>&1; then
-        echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, deleting"
-        rm "${COMPFILE}"
+        echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, replacing"
+        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
       fi
       rm -f "${TMPFILE1}" "${TMPFILE2}"
       ;;