# HG changeset patch # User Durham Goode # Date 1399508438 25200 # Node ID 750c7c14a6372b73d02e0dde3a868ac7313c0c75 # Parent 62a2749895e4151f766a4243fa870b1ddd7386d0 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. diff -r 62a2749895e4 -r 750c7c14a637 mercurial/exchange.py --- a/mercurial/exchange.py Wed May 07 17:58:13 2014 -0500 +++ 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: