From owner-freebsd-hackers Tue Feb 4 23:56:26 2003 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 5DD3D37B401 for ; Tue, 4 Feb 2003 23:56:25 -0800 (PST) Received: from 12-234-22-23.client.attbi.com (12-234-22-23.client.attbi.com [12.234.22.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id A356043FCE for ; Tue, 4 Feb 2003 23:56:24 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from slave.gorean.org (3lbfzz883oae8lth@slave.gorean.org [10.0.0.1]) by 12-234-22-23.client.attbi.com (8.12.6/8.12.6) with ESMTP id h157uNh9028241; Tue, 4 Feb 2003 23:56:23 -0800 (PST) (envelope-from DougB@FreeBSD.org) Date: Tue, 4 Feb 2003 23:56:23 -0800 (PST) From: Doug Barton To: Garance A Drosihn Cc: Dag-Erling Smorgrav , freebsd-hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior In-Reply-To: Message-ID: <20030204235300.L27397@12-234-22-23.pyvrag.nggov.pbz> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz> <20030204231125.X27397@12-234-22-23.pyvrag.nggov.pbz> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 5 Feb 2003, Garance A Drosihn wrote: > At 11:43 PM -0800 2/4/03, Doug Barton wrote: > >On Tue, 4 Feb 2003, Garance A Drosihn wrote: > > > > > At 10:36 PM -0800 2/3/03, Doug Barton wrote: > > > There's a section of mergemaster that starts out with the comment > >> "Do an absolute diff first to see if the files are actually different". > > > >That's an option that users can enable, it's not the default behavior. > > > >> What I was saying is we should add the same -I argument to that > >> diff command, > > > >That's not going to happen... the whole point of strict comparison > >mode is that ALL differences are displayed, no matter what. Since > >users choose this option, it's reasonable not to change its behavior. > > Oh, I didn't realize that was an optional behavior, I thought > that was the default code path. That request is my mistake then, > for skimming through the script a little too quickly. Yeah, I had the feeling that you thought it was the default... I meant to say something to that effect. I confess that the style isn't 100% readable to people who haven't spent as much time as I have working on it... my only defense is that when that script started, it was a whole lot simpler than it is now. :) Of course, there are some aspects of the style that I actually like, so I guess I'm not totally blameless here. Doug -- If it's moving, encrypt it. If it's not moving, encrypt it till it moves, then encrypt it some more. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message