Date: Sun, 09 Nov 2008 11:11:33 +0100 From: Alexander Leidinger <Alexander@Leidinger.net> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r184781 - head/usr.sbin/mergemaster Message-ID: <20081109111133.88165rocbmwehckc@webmail.leidinger.net> In-Reply-To: <200811090758.mA97wNKt033972@svn.freebsd.org> References: <200811090758.mA97wNKt033972@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Quoting Maxim Sobolev <sobomax@FreeBSD.org> (from Sun, 9 Nov 2008 07:58:23 +0000 (UTC)): > 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. I would like to have (ideally automatic) replacement of files in this case. Is it still possible to get the new file there with mergemaster after this patch? Bye, Alexander. > 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 > > -- BOFH excuse #171: NOTICE: alloc: /dev/null: filesystem full http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081109111133.88165rocbmwehckc>