Show More
@@ -294,10 +294,10 b' class transplanter(object):' | |||
|
294 | 294 | |
|
295 | 295 | return n |
|
296 | 296 | |
|
297 |
def resume(self, repo, source, opts |
|
|
297 | def resume(self, repo, source, opts): | |
|
298 | 298 | '''recover last transaction and apply remaining changesets''' |
|
299 | 299 | if os.path.exists(os.path.join(self.path, 'journal')): |
|
300 | n, node = self.recover(repo) | |
|
300 | n, node = self.recover(repo, opts) | |
|
301 | 301 | self.ui.status(_('%s transplanted as %s\n') % (short(node), |
|
302 | 302 | short(n))) |
|
303 | 303 | seriespath = os.path.join(self.path, 'series') |
@@ -312,7 +312,7 b' class transplanter(object):' | |||
|
312 | 312 | |
|
313 | 313 | self.apply(repo, source, revmap, merges, opts) |
|
314 | 314 | |
|
315 | def recover(self, repo): | |
|
315 | def recover(self, repo, opts): | |
|
316 | 316 | '''commit working directory using journal metadata''' |
|
317 | 317 | node, user, date, message, parents = self.readlog() |
|
318 | 318 | merge = False |
General Comments 0
You need to be logged in to leave comments.
Login now