# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1185218236 -7200
# Node ID 110c76a94d1c8f95ac432be15debe2790dd45a48
# Parent  304f9ac35869183db069c343d7beaf087b135125
help: no need for kwexpand after import, but after config change

Update test output.

diff -r 304f9ac35869 -r 110c76a94d1c hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Jul 23 10:36:00 2007 +0200
+++ b/hgkw/keyword.py	Mon Jul 23 21:17:16 2007 +0200
@@ -68,13 +68,15 @@
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
 the risk of inadvertedly storing expanded keywords in the change history.
 
+To force expansion after enabling it, or a configuration change, run
+"hg kwexpand".
+
 Expansions spanning more than one line and incremental expansions,
 like CVS' $Log$, are not supported. A keyword template map
 "Log = {desc}" expands to the first line of the changeset description.
 
 Caveat: "hg import" fails if the patch context contains an active
-        keyword. In that case run "hg kwshrink", reimport, and then
-        "hg kwexpand".
+        keyword. In that case run "hg kwshrink", and then reimport.
         Or, better, use bundle/unbundle to share changes.
 '''
 
diff -r 304f9ac35869 -r 110c76a94d1c tests/test-keyword.out
--- a/tests/test-keyword.out	Mon Jul 23 10:36:00 2007 +0200
+++ b/tests/test-keyword.out	Mon Jul 23 21:17:16 2007 +0200
@@ -22,12 +22,13 @@
 Again, run "hg kwdemo" to control the results of your config changes.
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
 the risk of inadvertedly storing expanded keywords in the change history.
+To force expansion after enabling it, or a configuration change, run
+"hg kwexpand".
 Expansions spanning more than one line and incremental expansions,
 like CVS' $Log$, are not supported. A keyword template map
 "Log = {desc}" expands to the first line of the changeset description.
 Caveat: "hg import" fails if the patch context contains an active
-        keyword. In that case run "hg kwshrink", reimport, and then
-        "hg kwexpand".
+        keyword. In that case run "hg kwshrink", and then reimport.
         Or, better, use bundle/unbundle to share changes.
  kwdemo     print [keywordmaps] configuration and an expansion example
  kwexpand   expand keywords in working directory