Date: Tue, 4 Feb 2003 23:56:23 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Garance A Drosihn <drosih@rpi.edu> Cc: Dag-Erling Smorgrav <des@ofug.org>, freebsd-hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior Message-ID: <20030204235300.L27397@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <p05200f64ba6671f4a271@[128.113.24.47]> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <p05200f24ba5c8412dcd1@[128.113.24.47]> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <p05200f26ba5c85ee4c77@[128.113.24.47]> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no> <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> <p05200f4cba64ed4989d3@[128.113.24.47]> <20030203221928.S11438@12-234-22-23.pyvrag.nggov.pbz> <p05200f4fba6513ae8982@[128.113.24.47]> <20030204231125.X27397@12-234-22-23.pyvrag.nggov.pbz> <p05200f64ba6671f4a271@[128.113.24.47]>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030204235300.L27397>