From owner-freebsd-hackers@FreeBSD.ORG Tue May 3 18:15:57 2005 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 774F416A4D3; Tue, 3 May 2005 18:15:57 +0000 (GMT) Received: from delight.idiom.com (delight.idiom.com [216.240.32.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DC2B43D46; Tue, 3 May 2005 18:15:57 +0000 (GMT) (envelope-from julian@elischer.org) Received: from idiom.com (idiom.com [216.240.32.1]) by delight.idiom.com (Postfix) with ESMTP id A866D1E115B; Tue, 3 May 2005 11:15:52 -0700 (PDT) Received: from [192.168.2.3] (home.elischer.org [216.240.48.38]) by idiom.com (8.12.11/8.12.11) with ESMTP id j43IFqqR058326; Tue, 3 May 2005 11:15:52 -0700 (PDT) (envelope-from julian@elischer.org) Message-ID: <4277BFD7.2000508@elischer.org> Date: Tue, 03 May 2005 11:15:51 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.7) Gecko/20050424 X-Accept-Language: en, hu MIME-Version: 1.0 To: c0ldbyte References: <427743ED.6020200@FreeBSD.org> <20050503120958.Y42342@eleanor.us1.wmi.uvac.net> In-Reply-To: <20050503120958.Y42342@eleanor.us1.wmi.uvac.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: hackers@freebsd.org cc: Denis Peplin Subject: Re: mergemaster improvement (auto-update for not modified files) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2005 18:15:57 -0000 c0ldbyte wrote: >> > > IMHO this isnt something that should be included with mergemaster due > to the following things. 1). It should upgrade a file if the files cvs > id doesnt match and provide you with a merge option, which it allready > does both of those as it is now. 2). Only upgrading files that havent > been changed is going to result in a positive false situation where > the user actually thinks that his/her system has been fully upgraded > and when in fact it hasnt, leaving added lines to files out where they > should have been merged in. Preferably also IMHO this patch to > mergemaster should be or would be better off renamed to another > project and/or an option for people to compile into the system if they > wish to have that kind of functionality. E.g: System/Addon for world > through the use of a set variable in /etc/make.conf.local or something > similiar. > > But with all due respect, This just seems like another case of a > "Bike Shed" incident. not at all. I've wanted this for a long time.. files that I have not touched are at default state and I wnat them to move to teh new default state. Files I have touched, I want to look at by hand. > > Best regards to humor. > --c0ldbyte >