Mercurial > hg-stable

changeset 20058:5e301ca90b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Sun, 17 Nov 2013 17:49:48 -0500
parents 6bb9de1e4d16 (current diff) d54467c1a198 (diff)
children 385e209377a6
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Sun Nov 17 13:31:18 2013 -0800
+++ b/hgext/convert/subversion.py	Sun Nov 17 17:49:48 2013 -0500
@@ -91,10 +91,11 @@
                   discover_changed_paths=True, strict_node_history=False):
     protocol = -1
     def receiver(orig_paths, revnum, author, date, message, pool):
+        paths = {}
         if orig_paths is not None:
             for k, v in orig_paths.iteritems():
-                orig_paths[k] = changedpath(v)
-        pickle.dump((orig_paths, revnum, author, date, message),
+                paths[k] = changedpath(v)
+        pickle.dump((paths, revnum, author, date, message),
                     fp, protocol)
 
     try:
--- a/hgext/share.py	Sun Nov 17 13:31:18 2013 -0800
+++ b/hgext/share.py	Sun Nov 17 17:49:48 2013 -0500
@@ -59,7 +59,7 @@
         lock and lock.release()
 
     # update store, spath, sopener and sjoin of repo
-    repo.__init__(repo.baseui, repo.root)
+    repo.unfiltered().__init__(repo.baseui, repo.root)
 
 cmdtable = {
     "share":