# HG changeset patch # User Gregory Szorc # Date 2015-11-03 20:16:54 # Node ID 9350f00a7b239fa72e598f2d28c603149bde337e # Parent cb4b0ec54990b6677225faaae100dd278d5e7464 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1658,6 +1658,10 @@ def _maybeapplyclonebundle(pullop): if not repo.ui.configbool('experimental', 'clonebundles', False): return + # Only run if local repo is empty. + if len(repo): + return + if pullop.heads: return diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t --- a/tests/test-clonebundles.t +++ b/tests/test-clonebundles.t @@ -167,12 +167,6 @@ Incremental pull doesn't fetch bundle $ cd partial-clone $ hg pull pulling from http://localhost:$HGPORT/ - applying clone bundle from http://localhost:$HGPORT1/partial.hg - adding changesets - adding manifests - adding file changes - added 0 changesets with 0 changes to 1 files - finished applying clone bundle searching for changes adding changesets adding manifests