From owner-svn-src-all@FreeBSD.ORG Fri Jan 2 22:15:22 2009 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC13C106575F for ; Fri, 2 Jan 2009 22:15:22 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 9A1F78FC21 for ; Fri, 2 Jan 2009 22:15:22 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 22775 invoked by uid 399); 2 Jan 2009 22:15:21 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 2 Jan 2009 22:15:21 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <495E91F8.3010706@FreeBSD.org> Date: Fri, 02 Jan 2009 14:15:20 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.18 (X11/20081128) MIME-Version: 1.0 To: Maxim Sobolev References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org> <495DC5AF.3050908@FreeBSD.org> In-Reply-To: <495DC5AF.3050908@FreeBSD.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2009 22:15:23 -0000 Maxim Sobolev wrote: > Doug Barton wrote: >> My other objections remain however, including the one about the -U >> option being a better solution that requires no new code. > > 1. -U option requires system to have the copy of the database from the > previous upgrade. It gives no help on the system that was installed from > CD. The man page clearly documents adding a DIFF_OPTION to ignore the CVS Id tags which the user can use the first time through. Thus they can do the update with new sources and build a database for the -U option next time through (which happens automatically in the background every time mergemaster is run). > 2. If the functionality has some issues leading to false positives I can > investigate and improve/fix. This is a given. > 3. I don't see anything so technically bad about that feature (put aside > implementation details). I would like to hear some of your principal > objections. As in any software project, extra code that isn't needed is a Bad Thing. It has maintenance costs down the road, and can lead to problems if one of the expectations its built on changes. A key part of the implementation of mergemaster is that it is (now, relatively) simple, and knows as little as possible about the files it manipulates. As I said in my first post, if there is overwhelming demand for this down the road that is not met by the existing solutions I'll consider adding a better implementation as an option, off by default. Doug -- This .signature sanitized for your protection