diff -r 63ebc698d06b -r 290d023e8306 tests/test-keyword.out --- a/tests/test-keyword.out Wed Jan 23 11:38:22 2008 +0100 +++ b/tests/test-keyword.out Wed Feb 06 18:35:16 2008 +0100 @@ -30,8 +30,9 @@ 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", and then reimport. +Caveat: With Mercurial versions prior to 4574925db5c0 "hg import" might + cause rejects if the patch context contains an active 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