From c0a54d20023ca70bc6d3d97f1676c98780c83669 Mon Sep 17 00:00:00 2001
From: sobomax <sobomax@FreeBSD.org>
Date: Sun, 9 Nov 2008 07:58:23 +0000
Subject: Ignore files that only differ in CVS Id tag.

MFC after:	2 weeks
---
 usr.sbin/mergemaster/mergemaster.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'usr.sbin/mergemaster')

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 91d964e..18242fb 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -947,6 +947,20 @@ for COMPFILE in `find . -type f -size +0`; do
       echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
       rm "${COMPFILE}"
       ;;
+
+    *)
+      tempfoo=`basename $0`
+      TMPFILE1=`mktemp -t ${tempfoo}` || break
+      TMPFILE2=`mktemp -t ${tempfoo}` || break
+      sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${DESTDIR}${COMPFILE#.}" > "${TMPFILE1}"
+      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}"
+      fi
+      rm -f "${TMPFILE1}" "${TMPFILE2}"
+      ;;
     esac
     ;;
   esac
-- 
cgit v1.1