diff mercurial/hg.py @ 13193:3bbbde6f3e9f

merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 27 Dec 2010 17:54:45 +0100
parents 115a9760c382 4d03707916d3
children 0935ff767285
line wrap: on
line diff
--- a/mercurial/hg.py	Sun Dec 26 00:43:49 2010 +0100
+++ b/mercurial/hg.py	Mon Dec 27 17:54:45 2010 +0100
@@ -543,9 +543,12 @@
     if r:
         dst.setconfig('bundle', 'mainreporoot', r)
 
-    # copy auth and http_proxy section settings
+    # copy selected local settings to the remote ui
     for sect in ('auth', 'http_proxy'):
         for key, val in src.configitems(sect):
             dst.setconfig(sect, key, val)
+    v = src.config('web', 'cacerts')
+    if v:
+        dst.setconfig('web', 'cacerts', v)
 
     return dst