# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1206275696 -3600
# Node ID 15a4c3d865017de99da0408236063842e08dde21
# Parent  432aa523282cf287ac27032b327b8aeb9abcb093# Parent  688d71563c0735768265be9bc878bcded7db08a7
Merge with stable

diff -r 432aa523282c -r 15a4c3d86501 tests/test-keyword
--- a/tests/test-keyword	Fri Mar 21 15:38:02 2008 +0100
+++ b/tests/test-keyword	Sun Mar 23 13:34:56 2008 +0100
@@ -296,3 +296,13 @@
 echo % hg cat
 hg cat sym a b
 echo
+
+echo % hg serve
+hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+cat hg.pid >> $DAEMON_PIDS
+echo % hgweb changeset
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
+echo % hgweb filediff
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
+echo % errors encountered
+cat errors.log
diff -r 432aa523282c -r 15a4c3d86501 tests/test-keyword.out
--- a/tests/test-keyword.out	Fri Mar 21 15:38:02 2008 +0100
+++ b/tests/test-keyword.out	Sun Mar 23 13:34:56 2008 +0100
@@ -393,3 +393,39 @@
 $Xinfo$
 ignore $Id$
 a
+% hg serve
+% hgweb changeset
+200 Script output follows
+
+
+# HG changeset patch
+# User User Name <user@example.com>
+# Date 3 0
+# Node ID cfa68229c1167443337266ebac453c73b1d5d16e
+# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
+xa
+
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
+@@ -0,0 +1,4 @@
++expand $Id$
++do not process $Id:
++xxx $
++$Xinfo$
+
+% hgweb filediff
+200 Script output follows
+
+
+--- a/a	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:02 1970 +0000
+@@ -1,3 +1,4 @@
+ expand $Id$
+ do not process $Id:
+ xxx $
++$Xinfo$
+
+
+
+
+% errors encountered