merge with the stable branch
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 10 Dec 2009 12:31:57 +0100
changeset 10026 0b0a46607ac9
parent 10024 2b630e4c8f2f (current diff)
parent 10025 fb45c1e4396f (diff)
child 10027 30d51a0df46c
merge with the stable branch
mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu Dec 10 00:14:22 2009 +0100
+++ b/mercurial/cmdutil.py	Thu Dec 10 12:31:57 2009 +0100
@@ -111,11 +111,16 @@
         v = opts.get(o) or src.config('ui', o)
         if v:
             dst.setconfig("ui", o, v)
+
     # copy bundle-specific options
     r = src.config('bundle', 'mainreporoot')
     if r:
         dst.setconfig('bundle', 'mainreporoot', r)
 
+    # copy auth section settings
+    for key, val in src.configitems('auth'):
+        dst.setconfig('auth', key, val)
+
     return dst
 
 def revpair(repo, revs):