# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1253354441 -7200
# Node ID a718e9827510e9ed866b2466575a2e00b0db9161
# Parent  bf971e786e93960f19abccac99f34fe4705e2c79# Parent  0c7f033354c7030012bcffd780a1135cb750a15d
(stable) merge with default

diff -r bf971e786e93 -r a718e9827510 tests/test-keyword
--- a/tests/test-keyword	Thu Aug 27 00:00:15 2009 +0200
+++ b/tests/test-keyword	Sat Sep 19 12:00:41 2009 +0200
@@ -5,6 +5,20 @@
 hgext.keyword =
 hgext.mq =
 hgext.notify =
+EOF
+
+# demo before [keyword] files are set up
+# would succeed without uisetup otherwise
+echo % hg kwdemo
+hg --quiet kwdemo \
+| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
+ -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
+ -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
+ -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!'
+
+hg --quiet kwdemo "Branch = {branches}"
+
+cat <<EOF >> $HGRCPATH
 [keyword]
 * =
 b = ignore
@@ -13,15 +27,6 @@
 commit.test=cp a hooktest
 EOF
 
-echo % hg kwdemo
-hg --quiet kwdemo --default \
-| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
- -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
- -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
- -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!'
-
-hg --quiet kwdemo "Branch = {branches}"
-
 hg init Test-bndl
 cd Test-bndl
 
diff -r bf971e786e93 -r a718e9827510 tests/test-keyword.out
--- a/tests/test-keyword.out	Thu Aug 27 00:00:15 2009 +0200
+++ b/tests/test-keyword.out	Sat Sep 19 12:00:41 2009 +0200
@@ -2,8 +2,6 @@
 [extensions]
 hgext.keyword = 
 [keyword]
-* = 
-b = ignore
 demo.txt = 
 [keywordmaps]
 RCSFile = {file|basename},v
@@ -23,8 +21,6 @@
 [extensions]
 hgext.keyword = 
 [keyword]
-* = 
-b = ignore
 demo.txt = 
 [keywordmaps]
 Branch = {branches}