Date: Fri, 21 Mar 2003 06:40:26 -0700 (MST) From: "M. Warner Losh" <imp@bsdimp.com> To: peterjeremy@optushome.com.au Cc: brandon@dvalentine.com, FreeBSD-Hackers@FreeBSD.ORG Subject: Re: generalized mergemaster(8) Message-ID: <20030321.064026.31318505.imp@bsdimp.com> In-Reply-To: <20030321082108.GA7590@cirb503493.alcatel.com.au> References: <20030321041548.GY25577@geekpunk.net> <20030321082108.GA7590@cirb503493.alcatel.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <20030321082108.GA7590@cirb503493.alcatel.com.au>
Peter Jeremy <peterjeremy@optushome.com.au> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030321.064026.31318505.imp>