From owner-freebsd-hackers@FreeBSD.ORG Wed May 4 12:57:14 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 8A0FE16A4CE; Wed, 4 May 2005 12:57:14 +0000 (GMT) Received: from mail.tacorp.net (mail.tacorp.net [64.246.111.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9F9E43D60; Wed, 4 May 2005 12:57:13 +0000 (GMT) (envelope-from raistlin@tacorp.net) Received: from mail.tacorp.net (raistlin@localhost [127.0.0.1]) by mail.tacorp.net (8.13.1/8.12.10) with ESMTP id j44D6mIw055419; Wed, 4 May 2005 09:06:48 -0400 (EDT) (envelope-from raistlin@tacorp.net) Received: from localhost (raistlin@localhost)j44D6li4055416; Wed, 4 May 2005 09:06:48 -0400 (EDT) (envelope-from raistlin@tacorp.net) X-Authentication-Warning: mail.tacorp.net: raistlin owned process doing -bs Date: Wed, 4 May 2005 09:06:47 -0400 (EDT) From: Jason Slagle To: c0ldbyte In-Reply-To: <20050503120958.Y42342@eleanor.us1.wmi.uvac.net> Message-ID: <20050504090413.S38366@mail.tacorp.net> References: <427743ED.6020200@FreeBSD.org> <20050503120958.Y42342@eleanor.us1.wmi.uvac.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed 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: Wed, 04 May 2005 12:57:14 -0000 On Tue, 3 May 2005, 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. First off, I'd like to introduce you to the concepts of paragraphs. When you change thoughts, it is customary to hit enter and start on a blank line. Sometimes, you can even leave a whole line between them. This tends to make your writing much more readable. In regards to your post, show me again where he said he was going to change the behavior of mergemaster OTHER then auto-updating non changed files? To me it looks like it will keep doing what it's doing now, with the exception of auto-updating files with no changes. This to me means I don't have to go approving a bunch of changes to files I've never touched. This is a good thing(tm). Jason -- Jason Slagle /"\ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . \ / ASCII Ribbon Campaign . X - NO HTML/RTF in e-mail . / \ - NO Word docs in e-mail .