# HG changeset patch # User Augie Fackler # Date 1295239851 21600 # Node ID 13e24740a50029a36cb1b86dc0d17228ec63cf21 # Parent 184d25bc1c0b55e7e41351fd77ff3975f527c848# Parent d38226a190ad0067782fc38b378701fc9e82555f Merge backout of 60948939555d. 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]: