Mercurial > hg-stable

changeset 21581:341039aa1154 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: fix configuration name mismatch During pulls bundle2 was checking server.bundle2, but during pushes it was checking experimental.bundle2. This makes them both experimental.bundle2. This is a backport of 750c7c14a637
author Durham Goode <durham@fb.com>
date Wed, 07 May 2014 17:20:38 -0700
parents 6c9b7712ac69
children 7f6d99a79411
files mercurial/exchange.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Sat May 17 15:14:18 2014 +0900
+++ b/mercurial/exchange.py	Wed May 07 17:20:38 2014 -0700
@@ -537,7 +537,7 @@
     lock = pullop.repo.lock()
     try:
         _pulldiscovery(pullop)
-        if (pullop.repo.ui.configbool('server', 'bundle2', False)
+        if (pullop.repo.ui.configbool('experimental', 'bundle2-exp', False)
             and pullop.remote.capable('bundle2-exp')):
             _pullbundle2(pullop)
         if 'changegroup' in pullop.todosteps: