Date: Thu, 01 Jan 2009 03:08:32 -0800 From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r186677 - head/usr.sbin/mergemaster Message-ID: <495CA430.5060900@FreeBSD.org> In-Reply-To: <200901011055.n01AtQaN052763@svn.freebsd.org> References: <200901011055.n01AtQaN052763@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I neglected to mention that there is already the -U option that will handle this situation nicely (as was discussed on -current the last time this came up). Doug Doug Barton wrote: > Author: dougb > Date: Thu Jan 1 10:55:26 2009 > New Revision: 186677 > URL: http://svn.freebsd.org/changeset/base/186677 > > Log: > Revert 184781, 184804, and 184832 (automatic installation of files > that differ only by VCS Id) for the following reasons: > 1. It was added without my consent, review, or even a heads up > 2. It is something that I've repeatedly said I do not want, and certainly > do not want as the default > 3. It is poorly implemented (much too complex, produces false positives > e.g., /etc/mail/helpfile) > > Given that this is a situation that comes up very infrequently (usually > only for a major version upgrade) and can usually be handled simply > enough on a one-off basis, I will once again point out that I think > this is a Bad Idea. I would be willing to consider a better implementation > as an option that is off by default. > > Modified: > head/usr.sbin/mergemaster/mergemaster.sh > > Modified: head/usr.sbin/mergemaster/mergemaster.sh > ============================================================================== > --- head/usr.sbin/mergemaster/mergemaster.sh Thu Jan 1 06:43:16 2009 (r186676) > +++ head/usr.sbin/mergemaster/mergemaster.sh Thu Jan 1 10:55:26 2009 (r186677) > @@ -947,25 +947,6 @@ 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?495CA430.5060900>