Date: Mon, 3 Feb 2003 09:12:45 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Dag-Erling Smorgrav <des@ofug.org> Cc: Garance A Drosihn <drosih@rpi.edu>, freebsd-hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior Message-ID: <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <xzpy94xa6fb.fsf@flood.ping.uio.no> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <p05200f24ba5c8412dcd1@[128.113.24.47]> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <p05200f26ba5c85ee4c77@[128.113.24.47]> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 3 Feb 2003, Dag-Erling Smorgrav wrote:
> Doug Barton <DougB@FreeBSD.org> 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.
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?20030203091128.Y4113>