Show More
@@ -151,10 +151,10 b' class transplanter:' | |||||
151 | log=opts.get('log'), |
|
151 | log=opts.get('log'), | |
152 | filter=opts.get('filter'), |
|
152 | filter=opts.get('filter'), | |
153 | lock=lock, wlock=wlock) |
|
153 | lock=lock, wlock=wlock) | |
154 | if domerge: |
|
154 | if n and domerge: | |
155 | self.ui.status(_('%s merged at %s\n') % (revstr, |
|
155 | self.ui.status(_('%s merged at %s\n') % (revstr, | |
156 | revlog.short(n))) |
|
156 | revlog.short(n))) | |
157 |
el |
|
157 | elif n: | |
158 | self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node), |
|
158 | self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node), | |
159 | revlog.short(n))) |
|
159 | revlog.short(n))) | |
160 | finally: |
|
160 | finally: | |
@@ -217,7 +217,7 b' class transplanter:' | |||||
217 | files=files) |
|
217 | files=files) | |
218 | if not files: |
|
218 | if not files: | |
219 | self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) |
|
219 | self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) | |
220 | return |
|
220 | return None | |
221 | finally: |
|
221 | finally: | |
222 | files = patch.updatedir(self.ui, repo, files, wlock=wlock) |
|
222 | files = patch.updatedir(self.ui, repo, files, wlock=wlock) | |
223 | except Exception, inst: |
|
223 | except Exception, inst: |
General Comments 0
You need to be logged in to leave comments.
Login now