changeset 780:13e24740a500

Merge backout of 60948939555d.
author Augie Fackler <durin42@gmail.com>
date Sun, 16 Jan 2011 22:50:51 -0600
parents 184d25bc1c0b (current diff) d38226a190ad (diff)
children 16252bea2026
files
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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]: