svn commit: r184804 - head/usr.sbin/mergemaster

[Maxim Sobolev]

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}"
       ;;