Date: Tue, 28 Jan 2003 14:17:02 -0500 From: Garance A Drosihn <drosih@rpi.edu> To: Matthew Dillon <dillon@apollo.backplane.com> Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <p05200f26ba5c85ee4c77@[128.113.24.47]> In-Reply-To: <200301281908.h0SJ8OoY028183@apollo.backplane.com> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <p05200f24ba5c8412dcd1@[128.113.24.47]> <200301281908.h0SJ8OoY028183@apollo.backplane.com>
next in thread | previous in thread | raw e-mail | index | archive | help
At 11:08 AM -0800 1/28/03, Matthew Dillon wrote: >:exactly what I would like, but I'm still trying to figure out >:how I would prefer to see it behave. >: >:-- >:Garance Alistair Drosehn = gad@gilead.netel.rpi.edu > > I'm sure it will get worked out. There really only two issues > that need to be solved (deterministic location of the file name, > deterministic UI i.e. not being left in the pager some times > and out of it other times), and several ways to solve them. 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. -- 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 cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p05200f26ba5c85ee4c77>