From owner-freebsd-current@FreeBSD.ORG Sat Dec 12 02:28:37 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AF071065672 for ; Sat, 12 Dec 2009 02:28:37 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 08A2D8FC08 for ; Sat, 12 Dec 2009 02:28:36 +0000 (UTC) Received: (qmail 32636 invoked by uid 399); 12 Dec 2009 02:28:36 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 12 Dec 2009 02:28:36 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4B22FFD9.7000207@FreeBSD.org> Date: Fri, 11 Dec 2009 18:28:41 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Thunderbird 2.0.0.23 (X11/20091206) MIME-Version: 1.0 To: freebsd-current@freebsd.org X-Enigmail-Version: 0.96.0 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: HEADS UP: New version of mergemaster with type checking X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2009 02:28:37 -0000 Howdy, I think the commit message explains this pretty well, but I wanted to give a heads up message because this is very likely to ring a few bells the first time through. I personally noticed it as result of the recent termcap change, and I'm sure I'm not the only one with stale stuff in /etc/ in particular. Please make sure that you employ (what should be) the usual precaution of backing up /etc before running this version of mergemaster. I also encourage regular use of the -P option (or PRESERVE_FILES=yes in ~/.mergemasterrc or /etc/mergemaster.rc) however while I believe that this new code is -P safe backing up /etc first is preferred this time around. If you have any feedback on the code, messages, etc. please offer them sooner rather than later. I will wait longer than 3 days for the MFC on this one but at minimum I want to get it into RELENG_7 well before the upcoming freeze. Enjoy, Doug -------- Original Message -------- Subject: svn commit: r200425 - head/usr.sbin/mergemaster Date: Sat, 12 Dec 2009 02:19:42 +0000 (UTC) Author: dougb Date: Sat Dec 12 02:19:41 2009 New Revision: 200425 URL: http://svn.freebsd.org/changeset/base/200425 Log: 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. -- Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/