From owner-cvs-src-old@FreeBSD.ORG  Thu Jan  1 10:55:40 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD0DD1065700
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 10:55:40 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AC9488FC0C
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 10:55:40 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n01AteW6000953
	for <cvs-src-old@freebsd.org>; Thu, 1 Jan 2009 10:55:40 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n01Ate5Q000952
	for cvs-src-old@freebsd.org; Thu, 1 Jan 2009 10:55:40 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200901011055.n01Ate5Q000952@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 1 Jan 2009 10:55:26 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2009 10:55:41 -0000

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