From owner-freebsd-hackers Fri Mar 21 8: 9: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 8FD3B37B401; Fri, 21 Mar 2003 08:09:35 -0800 (PST) Received: from aeimail.aei.ca (aeimail.aei.ca [206.123.6.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 553C043F85; Fri, 21 Mar 2003 08:09:34 -0800 (PST) (envelope-from anarcat@anarcat.ath.cx) Received: from shall.anarcat.ath.cx (73tsrtg1bhr2ykpi@dsl-133-253.aei.ca [66.36.133.253]) by aeimail.aei.ca (8.11.6/8.10.1) with ESMTP id h2LG9Rt07330; Fri, 21 Mar 2003 11:09:27 -0500 (EST) Received: from lenny.anarcat.ath.cx (lenny.anarcat.ath.cx [192.168.0.4]) by shall.anarcat.ath.cx (Postfix) with SMTP id 3FA6423E; Fri, 21 Mar 2003 11:09:26 -0500 (EST) Received: by lenny.anarcat.ath.cx (sSMTP sendmail emulation); Fri, 21 Mar 2003 11:09:25 -0500 Date: Fri, 21 Mar 2003 11:09:25 -0500 From: The Anarcat To: "Brandon D. Valentine" Cc: FreeBSD-Hackers , doubg@freebsd.org Subject: Re: generalized mergemaster(8) Message-ID: <20030321160925.GA1174@lenny.anarcat.ath.cx> References: <20030321041548.GY25577@geekpunk.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8t9RHnE3ZwKMSgU+" Content-Disposition: inline In-Reply-To: <20030321041548.GY25577@geekpunk.net> User-Agent: Mutt/1.5.3i 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 --8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable What we need is a way to mark some package files as customizeable files, or configuration files. The same way that some files are marked DOC, but a bit better: it would need to be carried to the installed package database. This is again re-inventing the wheel since it is exactly how Debian's apt-get system deals with configuration files. /etc files are part of a package that, when upgraded, are checked for modification and the user is offered the choice similar to mergemaster to install, merge, or just delete. We still need to write a generic tool to diff and merge. It's not so hard to write. It would basically be a stripped down version of mergemaster -s. I think such a tool would be really useful. A. 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. >=20 > Thoughts? >=20 > Brandon D. Valentine > --=20 > brandon@dvalentine.com http://www.geekpun= k.net > Pseudo-Random Googlism: valentine is her husband >=20 > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-hackers" in the body of the message >=20 --=20 Advertisers, not governments, are the primary censors of media content=20 in the United States today. - C. Edwin Baker http://www.ad-mad.co.uk/quotes/freespeech.htm --8t9RHnE3ZwKMSgU+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+ezk0ttcWHAnWiGcRAruvAKCG43EnbYgnlZiIpRblFQjJz1S4VwCgnO6f ZW7u7kgPaXXuy0vQ2Ny/JXE= =6t6M -----END PGP SIGNATURE----- --8t9RHnE3ZwKMSgU+-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message