# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271145951 -7200
# Node ID 28713701448806a3d8995e9277825d9753cd920d
# Parent  2f341cf2268dfbdf1139c5abe9da612bba3aa08a# Parent  d01d3a15995ad2c7d71fe4a0bf56323cbca8b066
Merge with stable

diff -r 2f341cf2268d -r 287137014488 tests/test-keyword.out
--- a/tests/test-keyword.out	Tue Mar 16 22:29:16 2010 +0100
+++ b/tests/test-keyword.out	Tue Apr 13 10:05:51 2010 +0200
@@ -198,7 +198,7 @@
 +do not process $Id:
 +xxx $
 % rollback
-rolling back last transaction
+rolling back to revision 2 (undo commit)
 % status
 A c
 % update -C
@@ -266,7 +266,7 @@
 % status
 ? c
 % rollback
-rolling back last transaction
+rolling back to revision 3 (undo commit)
 % status
 R a
 ? c
@@ -308,7 +308,7 @@
 ignore $Id$
 
 % rollback
-rolling back last transaction
+rolling back to revision 3 (undo commit)
 % clean update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % kwexpand/kwshrink on selected files