# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243274725 -7200
# Node ID b7b183546a1572b6b6c0304300aaa6e1c66302ec
# Parent  3fbd03b215e658d0453e3e2459f10fafe556d93f# Parent  e44b46c85b72289fa043d8d0861d833221ae7aa0
Merge with stable

diff -r 3fbd03b215e6 -r b7b183546a15 tests/test-keyword.out
--- a/tests/test-keyword.out	Tue May 19 05:48:42 2009 +0200
+++ b/tests/test-keyword.out	Mon May 25 20:05:25 2009 +0200
@@ -253,7 +253,7 @@
 % status
 A c
 % update -C
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % custom keyword expansion
 % try with kwdemo
 [extensions]
@@ -280,12 +280,14 @@
 abort: empty commit message
 % status
 M a
+? c
 ? log
 % commit
 a
 overwriting a expanding keywords
 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
+? c
 % verify
 checking changesets
 checking manifests
@@ -313,10 +315,12 @@
 % remove
 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
+? c
 % rollback
 rolling back last transaction
 % status
 R a
+? c
 % revert a
 % cat a
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $