On Wed, 2006-07-12 at 15:24 -0400, Neal Becker wrote: > 2) Attempt to merge changes, in the manner of a modern revision control > system. If you're just managing one machine, something like etc-update seems a reasonable solution, possibly together with making /etc a mercurial-or-whatever-your-favorite-scm-is repo. If you manage more than one machine, chances are you are using some sort of tool to track the configs of your machines, if not you should [1], in which case you will track and manually merge local changes to config files centrally. There's of course a lot of room to make the reconciling the local .rpmnew/.rpmsave files with the site configuration easier ... David [1] I highly recommend puppet if you are interested in using a config mgmt tool, http://reductivelabs.com/projects/puppet/ -- fedora-devel-list mailing list fedora-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-devel-list