From owner-freebsd-hackers Mon Feb 3 9:12:54 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 B628F37B401 for ; Mon, 3 Feb 2003 09:12:53 -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 09D1D43F85 for ; Mon, 3 Feb 2003 09:12:53 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from slave.gorean.org (nfqdsyq97ov6ft2o@slave.gorean.org [10.0.0.1]) by 12-234-22-23.client.attbi.com (8.12.6/8.12.6) with ESMTP id h13HCjh9004220; Mon, 3 Feb 2003 09:12:46 -0800 (PST) (envelope-from DougB@FreeBSD.org) Date: Mon, 3 Feb 2003 09:12:45 -0800 (PST) From: Doug Barton To: Dag-Erling Smorgrav Cc: Garance A Drosihn , freebsd-hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior In-Reply-To: Message-ID: <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> 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 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. 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