# HG changeset patch # User Christian Ebert # Date 1295189126 -3600 # Node ID 05e160f8f8bc78410084bcf5c827745e171c2bf2 # Parent c2651cd808b7819f12b1d93091bd8ea4b3c0e41a Update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory diff -r c2651cd808b7 -r 05e160f8f8bc hgkw/keyword.py --- a/hgkw/keyword.py Sun Dec 05 13:07:28 2010 +0100 +++ b/hgkw/keyword.py Sun Jan 16 15:45:26 2011 +0100 @@ -70,9 +70,8 @@ replaced with customized keywords and templates. Again, run :hg:`kwdemo` to control the results of your configuration changes. -Before changing/disabling active keywords, run :hg:`kwshrink` to avoid -the risk of inadvertently storing expanded keywords in the change -history. +Before changing/disabling active keywords, you must run :hg:`kwshrink` +to avoid storing expanded keywords in the change history. To force expansion after enabling it, or a configuration change, run :hg:`kwexpand`. @@ -465,8 +464,7 @@ def shrink(ui, repo, *pats, **opts): '''revert expanded keywords in the working directory - Run before changing/disabling active keywords or if you experience - problems with :hg:`import` or :hg:`merge`. + Must be run before changing/disabling active keywords. kwshrink refuses to run if given files contain local changes. '''