From owner-freebsd-hackers Fri Mar 21 11:27:20 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 5C5CA37B401; Fri, 21 Mar 2003 11:27:19 -0800 (PST) Received: from smtp3.server.rpi.edu (smtp3.server.rpi.edu [128.113.2.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C9D743F3F; Fri, 21 Mar 2003 11:27:18 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp3.server.rpi.edu (8.12.8/8.12.7) with ESMTP id h2LJRFQA006930; Fri, 21 Mar 2003 14:27:15 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <3E7B56B9.6050005@acm.org> References: <20030321041548.GY25577@geekpunk.net> <20030321160925.GA1174@lenny.anarcat.ath.cx> <3E7B56B9.6050005@acm.org> Date: Fri, 21 Mar 2003 14:27:14 -0500 To: kientzle@acm.org From: Garance A Drosihn Subject: Re: generalized mergemaster(8) Cc: "Brandon D. Valentine" , FreeBSD-Hackers , Doug Barton Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.28 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 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