In message: <[EMAIL PROTECTED]>
Peter Jeremy <[EMAIL PROTECTED]> 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 [EMAIL PROTECTED]
with "unsubscribe freebsd-hackers" in the body of the message
