Mercurial > public > mercurial-scm > hg
diff hgext/transplant.py @ 3724:ea523d6f5f1a
transplant: fix --continue; add --continue test
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 30 Nov 2006 11:09:25 -0800 |
| parents | c828fca6f38a |
| children | ccc7a9eb0e5e |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Nov 29 22:34:22 2006 -0800 +++ b/hgext/transplant.py Thu Nov 30 11:09:25 2006 -0800 @@ -231,8 +231,8 @@ '''recover last transaction and apply remaining changesets''' if os.path.exists(os.path.join(self.path, 'journal')): n, node = self.recover(repo) - self.ui.status(_('%s transplanted as %s\n') % (revlog.short(node), - revlog.short(n))) + self.ui.status(_('%s transplanted as %s\n') % (revlog.short(node), + revlog.short(n))) seriespath = os.path.join(self.path, 'series') if not os.path.exists(seriespath): return @@ -510,7 +510,7 @@ try: if opts.get('continue'): - n, node = tp.resume(repo, source, opts) + tp.resume(repo, source, opts) return tf=tp.transplantfilter(repo, source, p1)