nightmorph 08/03/02 08:09:37 Modified: hb-portage-tools.xml Log: etc-update sucks. use dispatch-conf. it's friendlier for new gentoo users and power developers alike.
Revision Changes Path 1.10 xml/htdocs/doc/en/handbook/hb-portage-tools.xml file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.10&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml?r1=1.9&r2=1.10 Index: hb-portage-tools.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hb-portage-tools.xml 28 Oct 2006 09:17:55 -0000 1.9 +++ hb-portage-tools.xml 2 Mar 2008 08:09:37 -0000 1.10 @@ -4,7 +4,7 @@ <!-- The content of this document is licensed under the CC-BY-SA license --> <!-- See http://creativecommons.org/licenses/by-sa/2.5 --> -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.9 2006/10/28 09:17:55 neysx Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-tools.xml,v 1.10 2008/03/02 08:09:37 nightmorph Exp $ --> <sections> @@ -13,23 +13,90 @@ better. Read on to discover how to use dispatch-conf and other tools. </abstract> -<version>1.4</version> -<date>2005-07-28</date> +<version>1.5</version> +<date>2008-03-01</date> <section> +<title>dispatch-conf</title> +<body> + +<p> +<c>dispatch-conf</c> is a tool that aids in merging the +<path>._cfg0000_<name></path> files. <path>._cfg0000_<name></path> +files are generated by Portage when it wants to overwrite a file in a directory +protected by the CONFIG_PROTECT variable. +</p> + +<p> +With <c>dispatch-conf</c>, you are able to merge updates to your configuration +files while keeping track of all changes. <c>dispatch-conf</c> stores the +differences between the configuration files as patches or by using the RCS +revision system. This means that if you make a mistake when updating a config +file, you can revert to the previous version of your config file at any time. +</p> + +<p> +When using <c>dispatch-conf</c>, you can ask to keep the configuration file +as-is, use the new configuration file, edit the current one or merge the changes +interactively. <c>dispatch-conf</c> also has some nice additional features: +</p> + +<ul> + <li> + Automatically merge configuration file updates that only contain updates to + comments + </li> + <li> + Automatically merge configuration files which only differ in the amount of + whitespace + </li> +</ul> + +<p> +Make certain you edit <path>/etc/dispatch-conf.conf</path> first and create the +directory referenced by the archive-dir variable. +</p> + +<pre caption="Running dispatch-conf"> +# <i>dispatch-conf</i> +</pre> + +<p> +When running <c>dispatch-conf</c>, you'll be taken through each changed config +file, one at a time. Press <c>u</c> to update (replace) the current config file +with the new one and continue to the next file. Press <c>z</c> to zap (delete) +the new config file and continue to the next file. Once all config files have +been taken care of, <c>dispatch-conf</c> will exit. You can also press <c>q</c> +to exit any time. +</p> + +<p> +For more information, check out the <c>dispatch-conf</c> man page. It tells you +how to interactively merge current and new config files, edit new config files, +examine differences between files, and more. +</p> + +<pre caption="Reading the dispatch-conf man page"> +$ <i>man dispatch-conf</i> +</pre> + +</body> +</section> +<section> <title>etc-update</title> <body> <p> -<c>etc-update</c> is a tool that aids in merging the -<path>._cfg0000_<name></path> files. It provides an interactive merging -setup and can also auto-merge trivial changes. -<path>._cfg0000_<name></path> files are generated by Portage when it wants -to overwrite a file in a directory protected by the CONFIG_PROTECT variable. +You can also use <c>etc-update</c> to merge config files. It's not as simple to +use as <c>dispatch-conf</c>, nor as featureful, but it does provide an +interactive merging setup and can also auto-merge trivial changes. </p> <p> -Running <c>etc-update</c> is pretty straight-forward: +However, unlike <c>dispatch-conf</c>, <c>etc-update</c> does <e>not</e> preserve +the old versions of your config files. Once you update the file, the old version +is gone forever! So be very careful, as using <c>etc-update</c> is +<e>significantly</e> less safe than using <c>dispatch-conf</c>. </p> <pre caption="Running etc-update"> @@ -109,50 +176,6 @@ </body> </section> <section> -<title>dispatch-conf</title> -<body> - -<p> -Using <c>dispatch-conf</c> you are able to merge updates to your configuration -files while keeping track of all changes. <c>dispatch-conf</c> stores the -differences between the configuration files as patches or by using the RCS -revision system. -</p> - -<p> -Like <c>etc-update</c>, you can ask to keep the configuration file as-is, use -the new configuration file, edit the current one or merge the changes -interactively. However, <c>dispatch-conf</c> also has some nice additional -features: -</p> - -<ul> - <li> - Automatically merge configuration file updates that only contain updates to - comments - </li> - <li> - Automatically merge configuration files which only differ in the amount of - whitespace - </li> -</ul> - -<p> -Make certain you edit <path>/etc/dispatch-conf.conf</path> first and create the -directory referenced by the archive-dir variable. -</p> - -<p> -For more information, check out the <c>dispatch-conf</c> man page: -</p> - -<pre caption="Reading the dispatch-conf man page"> -$ <i>man dispatch-conf</i> -</pre> - -</body> -</section> -<section> <title>quickpkg</title> <body> -- [email protected] mailing list
