From owner-freebsd-hackers  Mon Feb  3 11:55: 2 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 67E6F37B401; Mon,  3 Feb 2003 11:55:01 -0800 (PST)
Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4259A43F43; Mon,  3 Feb 2003 11:55:00 -0800 (PST)
	(envelope-from des@ofug.org)
Received: by flood.ping.uio.no (Postfix, from userid 2602)
	id D55605371; Mon,  3 Feb 2003 20:54:58 +0100 (CET)
X-URL: http://www.ofug.org/~des/
X-Disclaimer: The views expressed in this message do not necessarily
  coincide with those of any organisation or company with
  which I am or have been affiliated.
To: Doug Barton <DougB@FreeBSD.org>
Cc: Garance A Drosihn <drosih@rpi.edu>, freebsd-hackers@FreeBSD.org
Subject: Re: Modifying mergemaster behavior
From: Dag-Erling Smorgrav <des@ofug.org>
Date: Mon, 03 Feb 2003 20:54:58 +0100
In-Reply-To: <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> (Doug
 Barton's message of "Mon, 3 Feb 2003 09:12:45 -0800 (PST)")
Message-ID: <xzpel6p6sx9.fsf@flood.ping.uio.no>
User-Agent: Gnus/5.090014 (Oort Gnus v0.14) Emacs/21.2 (i386--freebsd)
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>
	<20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

Doug Barton <DougB@FreeBSD.org> writes:
> 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.

I don't see the problem, you don't need to run diff twice...  no more
than you already do (any reason why you don't use cmp instead of diff
on line 815?)

DES
-- 
Dag-Erling Smorgrav - des@ofug.org

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message