Date: Sun, 9 Nov 2008 07:58:23 +0000 (UTC) From: Maxim Sobolev <sobomax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184781 - head/usr.sbin/mergemaster Message-ID: <200811090758.mA97wNKt033972@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sobomax Date: Sun Nov 9 07:58:23 2008 New Revision: 184781 URL: http://svn.freebsd.org/changeset/base/184781 Log: Ignore files that only differ in CVS Id tag. MFC after: 2 weeks Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Sun Nov 9 07:34:11 2008 (r184780) +++ head/usr.sbin/mergemaster/mergemaster.sh Sun Nov 9 07:58:23 2008 (r184781) @@ -947,6 +947,20 @@ for COMPFILE in `find . -type f -size +0 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811090758.mA97wNKt033972>