diff -r f5927e5574e6 -r 63ebc698d06b tests/test-keyword.out
--- a/tests/test-keyword.out	Sat Jan 19 18:26:17 2008 +0100
+++ b/tests/test-keyword.out	Wed Jan 23 11:38:22 2008 +0100
@@ -24,6 +24,9 @@
 the risk of inadvertedly storing expanded keywords in the change history.
 To force expansion after enabling it, or a configuration change, run
 "hg kwexpand".
+Also, when committing with the record extension or using mq's qrecord, be aware
+that keywords cannot be updated. Again, run "hg kwexpand" on the files in
+question to update keyword expansions after all changes have been checked in.
 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.
@@ -121,8 +124,31 @@
 xxx $
 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
 tests for different changenodes
-% rollback and remove c
-rolling back last transaction
+% qimport
+% keywords should not be expanded in patch
+# HG changeset patch
+# User User Name <user@example.com>
+# Date 1 0
+# Node ID 7fefeeacf3596ca401a248c183c2314cbf4661ee
+# Parent  7f0665a496fd37c3627191bd02e26a1e230f2aa2
+cndiff
+
+diff -r 7f0665a496fd -r 7fefeeacf359 c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/c	Thu Jan 01 00:00:01 1970 +0000
+@@ -0,0 +1,2 @@
++$Id$
++tests for different changenodes
+% qpop
+Patch queue now empty
+% qpush
+applying mqtest.diff
+Now at: mqtest.diff
+% cat
+$Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
+tests for different changenodes
+% qpop and move on
+Patch queue now empty
 % copy
 % kwfiles added
 a
@@ -147,7 +173,7 @@
 diff -r 7f0665a496fd c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
-+expand $Id: c,v 6a127771f5db 1970/01/01 00:00:01 user $
++expand $Id$
 +do not process $Id:
 +xxx $
 % rollback