Date: Thu, 1 Jan 2009 10:55:26 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200901011055.n01Ate5Q000952@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-01-01 10:55:26 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
SVN rev 186677 on 2009-01-01 10:55:26Z by dougb
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.
Revision Changes Path
1.60 +0 -19 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901011055.n01Ate5Q000952>