Skip site navigation (1)Skip section navigation (2)
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>
In-Reply-To: <20030321041548.GY25577@geekpunk.net>
References:  <20030321041548.GY25577@geekpunk.net>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030321082108.GA7590>