# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304270311 -3600
# Node ID 95e99c4d10d315f5d7c9797ab01f7030c7d20df5
# Parent  08aeedc73cb7ad3bb83f3177aa8ee869d6faf3be# Parent  f4903069a2153157f9fafb7c65b51f088a1c8f49
Merge with stable

diff -r 08aeedc73cb7 -r 95e99c4d10d3 tests/bundles/test-keyword.hg
Binary file tests/bundles/test-keyword.hg has changed
diff -r 08aeedc73cb7 -r 95e99c4d10d3 tests/run-tests.py
--- a/tests/run-tests.py	Sun May 01 10:37:57 2011 +0100
+++ b/tests/run-tests.py	Sun May 01 18:18:31 2011 +0100
@@ -165,6 +165,8 @@
              "temporary installation")
     parser.add_option("-3", "--py3k-warnings", action="store_true",
         help="enable Py3k warnings on Python 2.6+")
+    parser.add_option('--extra-config-opt', action="append",
+                      help='set the given config opt in the test hgrc')
 
     for option, default in defaults.items():
         defaults[option] = int(os.environ.get(*default))
@@ -754,6 +756,12 @@
         hgrc.write('[inotify]\n')
         hgrc.write('pidfile=%s\n' % DAEMON_PIDS)
         hgrc.write('appendpid=True\n')
+    if options.extra_config_opt:
+        for opt in options.extra_config_opt:
+            section, key = opt.split('.', 1)
+            assert '=' in key, ('extra config opt %s must '
+                                'have an = for assignment' % opt)
+            hgrc.write('[%s]\n%s\n' % (section, key))
     hgrc.close()
 
     ref = os.path.join(TESTDIR, test+".out")
diff -r 08aeedc73cb7 -r 95e99c4d10d3 tests/test-keyword.hg
Binary file tests/test-keyword.hg has changed
diff -r 08aeedc73cb7 -r 95e99c4d10d3 tests/test-keyword.t
--- a/tests/test-keyword.t	Sun May 01 10:37:57 2011 +0100
+++ b/tests/test-keyword.t	Sun May 01 18:18:31 2011 +0100
@@ -78,7 +78,7 @@
  hg ci -m addsym -u mercurial
  hg bundle --base null ../test-keyword.hg
 
-  $ hg pull -u "$TESTDIR"/test-keyword.hg
+  $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
   pulling from *test-keyword.hg (glob)
   requesting all changes
   adding changesets