diff options
| author | sobomax <sobomax@FreeBSD.org> | 2008-11-09 07:58:23 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2008-11-09 07:58:23 +0000 |
| commit | c0a54d20023ca70bc6d3d97f1676c98780c83669 (patch) | |
| tree | 4ca44d40a6f67a8a02e9584e752870bda71decee /usr.sbin/mergemaster | |
| parent | 21b9f8808fff430e78a47a5a84187cf53c70e57b (diff) | |
| download | FreeBSD-src-c0a54d20023ca70bc6d3d97f1676c98780c83669.zip FreeBSD-src-c0a54d20023ca70bc6d3d97f1676c98780c83669.tar.gz | |
Ignore files that only differ in CVS Id tag.
MFC after: 2 weeks
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 14 |
1 files changed, 14 insertions, 0 deletions
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 |
