Date: Sun, 2 Feb 2003 00:10:55 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Garance A Drosihn <drosih@rpi.edu> Cc: Matthew Dillon <dillon@apollo.backplane.com>, freebsd-hackers@FreeBSD.org Subject: Modifying mergemaster behavior Message-ID: <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <p05200f26ba5c85ee4c77@[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]>
next in thread | previous in thread | raw e-mail | index | archive | help
[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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030201235429.G77226>