From owner-freebsd-hackers  Fri Mar 21  0:21:21 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 D5E8D37B401
	for <FreeBSD-Hackers@FreeBSD.ORG>; Fri, 21 Mar 2003 00:21:20 -0800 (PST)
Received: from cirb503493.alcatel.com.au (c18609.belrs1.nsw.optusnet.com.au [210.49.80.204])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E580043F75
	for <FreeBSD-Hackers@FreeBSD.ORG>; Fri, 21 Mar 2003 00:21:18 -0800 (PST)
	(envelope-from peterjeremy@optushome.com.au)
Received: from cirb503493.alcatel.com.au (localhost.alcatel.com.au [127.0.0.1])
	by cirb503493.alcatel.com.au (8.12.8/8.12.8) with ESMTP id h2L8LBM2007611;
	Fri, 21 Mar 2003 19:21:11 +1100 (EST)
	(envelope-from jeremyp@cirb503493.alcatel.com.au)
Received: (from jeremyp@localhost)
	by cirb503493.alcatel.com.au (8.12.8/8.12.8/Submit) id h2L8L9l7007610;
	Fri, 21 Mar 2003 19:21:09 +1100 (EST)
Date: Fri, 21 Mar 2003 19:21:08 +1100
From: Peter Jeremy <peterjeremy@optushome.com.au>
To: "Brandon D. Valentine" <brandon@dvalentine.com>
Cc: FreeBSD-Hackers <FreeBSD-Hackers@FreeBSD.ORG>
Subject: Re: generalized mergemaster(8)
Message-ID: <20030321082108.GA7590@cirb503493.alcatel.com.au>
References: <20030321041548.GY25577@geekpunk.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030321041548.GY25577@geekpunk.net>
User-Agent: Mutt/1.4.1i
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

On Thu, Mar 20, 2003 at 10:15:48PM -0600, Brandon D. Valentine wrote:
>I have encountered a situation in which it would be extremely handy to
>have a generalized version of mergemaster(8) which is less specific to
>the task of merging /etc.  I need to recursively merge two directories
>of source files in which I wish to preserve some original files, install
>some replacement files outright, and only actually go to the trouble of
>sdiff(1)ing those files that from the preview udiff look like they are
>need of a merge.

Have you considered emacs ediff-directories?  It might be better suited
than mergemaster for handling arbitrary directories.

Peter

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