From owner-freebsd-hackers Fri Mar 21 5:41: 6 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 1458D37B401 for ; Fri, 21 Mar 2003 05:41:05 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5027243F3F for ; Fri, 21 Mar 2003 05:41:04 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h2LDetA7047857; Fri, 21 Mar 2003 06:40:55 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Fri, 21 Mar 2003 06:40:26 -0700 (MST) Message-Id: <20030321.064026.31318505.imp@bsdimp.com> To: peterjeremy@optushome.com.au Cc: brandon@dvalentine.com, FreeBSD-Hackers@FreeBSD.ORG Subject: Re: generalized mergemaster(8) From: "M. Warner Losh" In-Reply-To: <20030321082108.GA7590@cirb503493.alcatel.com.au> References: <20030321041548.GY25577@geekpunk.net> <20030321082108.GA7590@cirb503493.alcatel.com.au> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii 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 In message: <20030321082108.GA7590@cirb503493.alcatel.com.au> Peter Jeremy writes: : Have you considered emacs ediff-directories? It might be better suited : than mergemaster for handling arbitrary directories. NetBSD also has usr.sbin/etcupdate, which appears to be a redone mergemaster which seems to a little better. Personally, I wish that there was a set of scripts that did the following: (1) gather all the files together that its going to update. (2) cvs import them into a repository on a vendor branch. (3.a) before the update, it would take recent changes and commit them to the head of this repo. (b) It would then cvs import the latest from a FreeBSD source tree onto the vendor branch. (c) it would run cvs update -j old -j new (d) cvs commit after resolving 'C' (e) install those that differ unconditionally (f) run the scripts that mergemaster runs now if the magic files are updated. But that's quite a bit different than mergemaster, and a lot more overhead to setup unless the scripts are very smart... Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message