# HG changeset patch # User Dirkjan Ochtman # Date 1260444717 -3600 # Node ID 0b0a46607ac9ea8031d516a3806ba5a523cf39cf # Parent 2b630e4c8f2f626f1e5d0f88646463968860f8ac# Parent fb45c1e4396f277e3f1be487a3e813fd12bcae90 merge with the stable branch diff -r 2b630e4c8f2f -r 0b0a46607ac9 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):