From owner-freebsd-hackers Mon Feb 3 20:27: 6 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 422F937B401; Mon, 3 Feb 2003 20:27:04 -0800 (PST) Received: from mail.rpi.edu (mail.rpi.edu [128.113.2.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5157543F43; Mon, 3 Feb 2003 20:27:03 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.12.1/8.12.1) with ESMTP id h144QqGB254120; Mon, 3 Feb 2003 23:26:52 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <20030203091128.Y4113@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> Date: Mon, 3 Feb 2003 23:26:51 -0500 To: Doug Barton , Dag-Erling Smorgrav From: Garance A Drosihn Subject: Re: Modifying mergemaster behavior Cc: freebsd-hackers@FreeBSD.ORG Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.3 (www dot roaringpenguin dot com slash mimedefang) 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 At 9:12 AM -0800 2/3/03, Doug Barton wrote: >On Mon, 3 Feb 2003, Dag-Erling Smorgrav wrote: > >> Doug Barton 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 = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message