From owner-freebsd-hackers Sun Feb 2 0:11: 3 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 0E17F37B401 for ; Sun, 2 Feb 2003 00:11:02 -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 2698943F3F for ; Sun, 2 Feb 2003 00:11:01 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from slave.gorean.org (y3xl1z82myxc205j@slave.gorean.org [10.0.0.1]) by 12-234-22-23.client.attbi.com (8.12.6/8.12.6) with ESMTP id h128AtfS077473; Sun, 2 Feb 2003 00:10:56 -0800 (PST) (envelope-from DougB@FreeBSD.org) Date: Sun, 2 Feb 2003 00:10:55 -0800 (PST) From: Doug Barton To: Garance A Drosihn Cc: Matthew Dillon , freebsd-hackers@FreeBSD.org Subject: Modifying mergemaster behavior In-Reply-To: Message-ID: <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> 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 [Re-directing to -hackers] 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. Chances are mighty good that the cvs-ID comment tells me > nothing that helps me decide what I want to do, and it wastes > five or six valuable lines on the screen. This is an oft-requested feature, but I'm not sure how best to implement it. To satisfy all the possible combinations of things to display or not display would require running diffs at least twice every time we find something different. I'm not sure it's worth it to save 5 or 6 lines, especially when you're sending everything to $PAGER anyway. 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