# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1219614292 -7200
# Node ID b395cf3c0d0a64bf45d5e895209bb0b1a9ad4913
# Parent  5c3637b12e8866c20dcd61ae20e133fc54676d5a# Parent  9cf55f18adad316d73913444531722c5665a9944
Merge with stable

diff -r 5c3637b12e88 -r b395cf3c0d0a tests/test-keyword.out
--- a/tests/test-keyword.out	Fri Aug 22 08:26:18 2008 +0200
+++ b/tests/test-keyword.out	Sun Aug 24 23:44:52 2008 +0200
@@ -117,6 +117,7 @@
 b
 overwriting a expanding keywords
 running hook commit.test: cp a hooktest
+committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
 % status
 ? hooktest
 % identify
@@ -223,6 +224,7 @@
 c
  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 overwriting c expanding keywords
+committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f
 % cat a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
@@ -280,6 +282,7 @@
 % commit
 a
 overwriting a expanding keywords
+committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
 % verify
 checking changesets
@@ -306,6 +309,7 @@
 1: xxx $
 2: $Xinfo$
 % remove
+committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 % rollback
 rolling back last transaction
@@ -337,6 +341,7 @@
 % commit rejecttest
 a
 overwriting a expanding keywords
+committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
 % export
 % import
 applying ../rejecttest.diff
@@ -360,6 +365,7 @@
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
+committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e
 % cat a
 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
 do not process $Id: