Date: Fri, 21 Mar 2003 14:27:14 -0500 From: Garance A Drosihn <drosih@rpi.edu> To: kientzle@acm.org Cc: "Brandon D. Valentine" <brandon@dvalentine.com>, FreeBSD-Hackers <FreeBSD-Hackers@FreeBSD.ORG>, Doug Barton <dougb@FreeBSD.ORG> Subject: Re: generalized mergemaster(8) Message-ID: <p05200f3dbaa114ea3932@[128.113.24.47]> In-Reply-To: <3E7B56B9.6050005@acm.org> References: <20030321041548.GY25577@geekpunk.net> <20030321160925.GA1174@lenny.anarcat.ath.cx> <3E7B56B9.6050005@acm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At 10:15 AM -0800 3/21/03, Tim Kientzle wrote: >>On Thu Mar 20, 2003, Brandon D. Valentine wrote: >> >>>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. At times I've asked Doug about some kind of pattern-support in ~/.mergemasterrc, where the user could specify filename-patterns of files where they want the default action to be "install" instead of "leave for later". There are pros and cons with that idea, but that's what I was thinking of for the directories you describe. Doug has suggested that people could maybe do things with the MM_PRE_COMPARE_SCRIPT, for special processing like this. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu 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?p05200f3dbaa114ea3932>