From owner-freebsd-hackers Thu Mar 20 22:27:37 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 42A5E37B401; Thu, 20 Mar 2003 22:27:36 -0800 (PST) Received: from geekpunk.net (adsl-32-194-137.bna.bellsouth.net [67.32.194.137]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55C1143F75; Thu, 20 Mar 2003 22:27:35 -0800 (PST) (envelope-from bandix@geekpunk.net) Received: from localhost.my.domain (taran [127.0.0.1]) by geekpunk.net (8.12.6/8.12.6) with ESMTP id h2L6RdNB038358; Fri, 21 Mar 2003 00:27:39 -0600 (CST) (envelope-from bandix@geekpunk.net) Received: (from bandix@localhost) by localhost.my.domain (8.12.6/8.12.6/Submit) id h2L6Rde9038357; Fri, 21 Mar 2003 00:27:39 -0600 (CST) (envelope-from bandix) Date: Fri, 21 Mar 2003 00:27:38 -0600 From: "Brandon D. Valentine" To: FreeBSD-Hackers Cc: dougb@freebsd.org Subject: Re: generalized mergemaster(8) Message-ID: <20030321062738.GB25577@geekpunk.net> References: <20030321041548.GY25577@geekpunk.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030321041548.GY25577@geekpunk.net> User-Agent: Mutt/1.4i 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 [ I meant to Cc dougb, not 'doubg' on this. Doh. ] 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. Has anyone already done the work of generalizing > mergemaster to this more general task? And if not, is there interest in > this? If nobody has done it I'm probably about to. My inclination is > to extend the existing mergemaster script to support this general > functionality while maintaining support for the specific case of an /etc > merge. mergemaster(8) is already fairly applicable to this task but it > currently makes some assumptions about what your $Id$ looks like and > that you will in fact be running make(1) somewhere to generate your > temproot. > > Thoughts? > > Brandon D. Valentine > -- > brandon@dvalentine.com http://www.geekpunk.net > Pseudo-Random Googlism: valentine is her husband > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-hackers" in the body of the message Brandon D. Valentine -- brandon@dvalentine.com http://www.geekpunk.net Pseudo-Random Googlism: brandon is a rare football player with great hands and speed To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message