diff mercurial/hg.py @ 13315:0d1dca7d2a04

merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 28 Jan 2011 03:09:22 +0100
parents 0935ff767285 8dc488dfcdb4
children 3f6a4579f803 adf3c4401c5d
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Jan 27 17:22:37 2011 -0600
+++ b/mercurial/hg.py	Fri Jan 28 03:09:22 2011 +0100
@@ -544,7 +544,7 @@
         dst.setconfig('bundle', 'mainreporoot', r)
 
     # copy selected local settings to the remote ui
-    for sect in ('auth', 'http_proxy'):
+    for sect in ('auth', 'hostfingerprints', 'http_proxy'):
         for key, val in src.configitems(sect):
             dst.setconfig(sect, key, val)
     v = src.config('web', 'cacerts')