# HG changeset patch # User Gregory Szorc # Date 1446581814 28800 # Node ID 9350f00a7b239fa72e598f2d28c603149bde337e # Parent cb4b0ec54990b6677225faaae100dd278d5e7464 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) diff -r cb4b0ec54990 -r 9350f00a7b23 mercurial/exchange.py --- a/mercurial/exchange.py Tue Nov 03 12:15:14 2015 -0800 +++ b/mercurial/exchange.py Tue Nov 03 12:16:54 2015 -0800 @@ -1658,6 +1658,10 @@ 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 -r cb4b0ec54990 -r 9350f00a7b23 tests/test-clonebundles.t --- a/tests/test-clonebundles.t Tue Nov 03 12:15:14 2015 -0800 +++ b/tests/test-clonebundles.t Tue Nov 03 12:16:54 2015 -0800 @@ -167,12 +167,6 @@ $ 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