From owner-cvs-src-old@FreeBSD.ORG  Sat Dec 12 02:20:03 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 EFAE010656C5
	for <cvs-src-old@freebsd.org>; Sat, 12 Dec 2009 02:20:03 +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 D9D0F8FC17
	for <cvs-src-old@freebsd.org>; Sat, 12 Dec 2009 02:20:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBC2K3Ov001401
	for <cvs-src-old@freebsd.org>; Sat, 12 Dec 2009 02:20:03 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBC2K3AC001400
	for cvs-src-old@freebsd.org; Sat, 12 Dec 2009 02:20:03 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200912120220.nBC2K3AC001400@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: Sat, 12 Dec 2009 02:19:41 +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: Sat, 12 Dec 2009 02:20:04 -0000

dougb       2009-12-12 02:19:41 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 200425 on 2009-12-12 02:19:41Z by dougb
  
  Over time things that used to be files/directories/links can change
  to something else. So add code to detect when things don't match and
  give the user choices about how to fix it.
  
  If we're using -P and something in the above check needs to be moved
  we need to have the directory there for it, so create it at the
  beginning and delete empty versions of it at the end.
  
  The case where something used to be a file or link and now is supposed
  to be a directory (e.g., /etc/security) is especially dangerous, so
  make failure to install a necessary directory in $DESTDIR a fatal error.
  
  Revision  Changes    Path
  1.74      +59 -2     src/usr.sbin/mergemaster/mergemaster.sh