Date: Wed, 10 Dec 2008 11:09:31 +0000 (UTC) From: Maxim Sobolev <sobomax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r185856 - stable/6/usr.sbin/mergemaster Message-ID: <200812101109.mBAB9VnV028855@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sobomax Date: Wed Dec 10 11:09:31 2008 New Revision: 185856 URL: http://svn.freebsd.org/changeset/base/185856 Log: MFC: automatically upgrade files that only differ in CVS Id tag. Modified: stable/6/usr.sbin/mergemaster/ (props changed) stable/6/usr.sbin/mergemaster/mergemaster.sh Modified: stable/6/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/6/usr.sbin/mergemaster/mergemaster.sh Wed Dec 10 11:03:16 2008 (r185855) +++ stable/6/usr.sbin/mergemaster/mergemaster.sh Wed Dec 10 11:09:31 2008 (r185856) @@ -947,6 +947,25 @@ 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, replacing" + if mm_install "${COMPFILE}"; then + echo " *** ${COMPFILE} upgraded successfully" + echo '' + else + echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" + fi + fi + rm -f "${TMPFILE1}" "${TMPFILE2}" + ;; esac ;; esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812101109.mBAB9VnV028855>