# HG changeset patch # User Augie Fackler # Date 1295239756 21600 # Node ID d38226a190ad0067782fc38b378701fc9e82555f # Parent 60948939555dbe16336519115dfd244698fb2182 Backed out changeset 60948939555d This was causing breakage with hg-git installed, and I'm more tired of user gripes that hg-git and hgsubversion are incompatible than of hearing complaints about doubled authentication prompts. Hopefully at some point we can do better than this. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -439,9 +439,7 @@ def clone(orig, ui, source, dest=None, * data['branches'] = branches ui.setconfig('hgsubversion', 'branch', branches[-1]) - # NOTE: this breaks on Mercurial 1.6, where passing a repository - # object to hg.clone() will abort. Mercurial 1.6.1 fixed it. - data['srcrepo'], data['dstrepo'] = orig(ui, srcrepo, dest, **opts) + data['srcrepo'], data['dstrepo'] = orig(ui, origsource, dest, **opts) for opt, (section, name) in optionmap.iteritems(): if opt in opts and opts[opt]: