diff mercurial/bundlerepo.py @ 18142:11d1a9143adb

merge with stable
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Dec 2012 11:55:45 +0100
parents 6db318a15a12 8ab0640c3090
children 5e851ca54189
line wrap: on
line diff
--- a/mercurial/bundlerepo.py	Fri Dec 28 00:02:40 2012 +0100
+++ b/mercurial/bundlerepo.py	Fri Dec 28 11:55:45 2012 +0100
@@ -352,7 +352,7 @@
                 os.unlink(bundlename)
         except OSError:
             pass
-        return other, [], other.close
+        return repo, [], other.close
 
     bundle = None
     bundlerepo = None