From owner-freebsd-hackers Fri Mar 21 10:14:57 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 EA08037B404 for ; Fri, 21 Mar 2003 10:14:55 -0800 (PST) Received: from kientzle.com (h-66-166-149-50.SNVACAID.covad.net [66.166.149.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id E553543F3F for ; Fri, 21 Mar 2003 10:14:54 -0800 (PST) (envelope-from kientzle@acm.org) Received: from acm.org (ugly.x.kientzle.com [66.166.149.51]) by kientzle.com (8.11.3/8.11.3) with ESMTP id h2LIEqM06233; Fri, 21 Mar 2003 10:14:52 -0800 (PST) (envelope-from kientzle@acm.org) Message-ID: <3E7B56B9.6050005@acm.org> Date: Fri, 21 Mar 2003 10:15:21 -0800 From: Tim Kientzle Reply-To: kientzle@acm.org User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:0.9.6) Gecko/20011206 X-Accept-Language: en-us, en MIME-Version: 1.0 Cc: "Brandon D. Valentine" , FreeBSD-Hackers Subject: Re: generalized mergemaster(8) References: <20030321041548.GY25577@geekpunk.net> <20030321160925.GA1174@lenny.anarcat.ath.cx> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: 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. 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... Tim To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message