# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1206110282 -3600
# Node ID 432aa523282cf287ac27032b327b8aeb9abcb093
# Parent  ff5b52ea337b4757e7943f04b3820bf814a5f517# Parent  39fef460b62c0ab1bbdd56915be70f84b22a4550
Merge with stable

diff -r ff5b52ea337b -r 432aa523282c tests/test-keyword
--- a/tests/test-keyword	Tue Mar 11 23:55:38 2008 +0100
+++ b/tests/test-keyword	Fri Mar 21 15:38:02 2008 +0100
@@ -158,8 +158,7 @@
 hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
 echo % cat a c
 cat a c
-echo % touch copied c after 1 second
-sleep 1
+echo % touch copied c
 touch c
 echo % status
 hg status
diff -r ff5b52ea337b -r 432aa523282c tests/test-keyword.out
--- a/tests/test-keyword.out	Tue Mar 11 23:55:38 2008 +0100
+++ b/tests/test-keyword.out	Fri Mar 21 15:38:02 2008 +0100
@@ -230,7 +230,7 @@
 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $
 do not process $Id:
 xxx $
-% touch copied c after 1 second
+% touch copied c
 % status
 % kwfiles
 a
@@ -312,6 +312,7 @@
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
+updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
 comparing with test-keyword/Test