Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/transplant.py
changeset 18926 8deaa703a622
parent 18919 cdf764a2f7a5
child 19027 3f5fac4b1cfa 
--- a/hgext/transplant.py	Fri Apr 12 18:35:26 2013 -0700
+++ b/hgext/transplant.py	Fri Apr 12 18:44:22 2013 -0700
@@ -297,7 +297,7 @@
     def resume(self, repo, source, opts):
         '''recover last transaction and apply remaining changesets'''
         if os.path.exists(os.path.join(self.path, 'journal')):
-            n, node = self.recover(repo, opts)
+            n, node = self.recover(repo, source, opts)
             self.ui.status(_('%s transplanted as %s\n') % (short(node),
                                                            short(n)))
         seriespath = os.path.join(self.path, 'series')
@@ -312,7 +312,7 @@
 
         self.apply(repo, source, revmap, merges, opts)
 
-    def recover(self, repo, opts):
+    def recover(self, repo, source, opts):
         '''commit working directory using journal metadata'''
         node, user, date, message, parents = self.readlog()
         merge = False
mercurial