At 9:12 AM -0800 2/3/03, Doug Barton wrote:
On Mon, 3 Feb 2003, Dag-Erling Smorgrav wrote:
Doug Barton <[EMAIL PROTECTED]> writes:
> On Tue, 28 Jan 2003, Garance A Drosihn wrote:
> > Well for one thing, if a given file has a lot of changes, then I
> > would like mergemaster to skip over the initial one-line change
> > that only tells me how some comment now has a new version-number
> > in it.
> >
> > This is an oft-requested feature, but I'm not sure how best to
> > implement it.
>
Look up the -I option in the diff(1) man page.
I didn't say I don't know HOW to implement it, I said I didn't know
how BEST to implement it. You snipped the part of my e-mail where I
explained the issues.
I happen to be updating my system tonight, so when it came to the
mergemaster step I first modified the script. I added:
-I '$FreeBSD:.*$'
to the 'diff ${DIFF_FLAG}' command in diff_loop, and it seems to have
worked the way I wanted it to work. From my skimming of the script,
I do not see how this change would cause problems for any other
processing. However, it's possible I'm missing something. If so, my
gut reaction is that if a lot of FreeBSD users are requesting this,
then we should figure out how to make it happen -- one way or another.
I suppose we should also change the 'absolute diff first' part to
include that, or people will be asked about merging a file, only
to be shown a file which apparently has zero changes.
I'd also note that the separator line (=====) is usually scrolled
off the window for me. Not much point to a good eye-catching line
if the line is usually not on the screen. Shouldn't that be moved
inside the
( ... ) | ${PAGER}
lines? And (IMO) delete one of the blank lines that are printed
out between the separator and the "Displaying differences" line.
--
Garance Alistair Drosehn = [EMAIL PROTECTED]
Senior Systems Programmer or [EMAIL PROTECTED]
Rensselaer Polytechnic Institute or [EMAIL PROTECTED]
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-hackers" in the body of the message
