Date: Fri, 21 Mar 2003 10:15:21 -0800 From: Tim Kientzle <kientzle@acm.org> Cc: "Brandon D. Valentine" <brandon@dvalentine.com>, FreeBSD-Hackers <FreeBSD-Hackers@FreeBSD.ORG> Subject: Re: generalized mergemaster(8) Message-ID: <3E7B56B9.6050005@acm.org> References: <20030321041548.GY25577@geekpunk.net> <20030321160925.GA1174@lenny.anarcat.ath.cx>
index | next in thread | previous in thread | raw e-mail
> 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.
One feature I've long wanted to see in mergemaster is
the ability to install an entire directory at a pop,
without having to manually inspect every single
entry in that directory. A good example is /etc/rc.d:
I would really like to be told
"/var/tmp/temproot/etc/rc.d/ and /etc/rc.d/ have 17 differing files.
(I)nstall, (D)elete, or (R)ecursively examine? [R]"
Then I could hit 'I' and update all of /etc/rc.d at once.
Someday, a curses-based mergemaster that showed a dir heirarchy
with differences clearly annotated... <sigh>
Tim
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3E7B56B9.6050005>