Show More
@@ -404,7 +404,9 b' class rebaseruntime(object):' | |||||
404 | else: |
|
404 | else: | |
405 | self.wctx = self.repo[None] |
|
405 | self.wctx = self.repo[None] | |
406 | self.repo.ui.debug("rebasing on disk\n") |
|
406 | self.repo.ui.debug("rebasing on disk\n") | |
407 |
self.repo.ui.log("rebase", |
|
407 | self.repo.ui.log("rebase", | |
|
408 | "using in-memory rebase: %r\n", self.inmemory, | |||
|
409 | rebase_imm_used=self.inmemory) | |||
408 |
|
410 | |||
409 | def _performrebase(self, tr): |
|
411 | def _performrebase(self, tr): | |
410 | self._assignworkingcopy() |
|
412 | self._assignworkingcopy() | |
@@ -1076,7 +1078,8 b' def _definedestmap(ui, repo, inmemory, d' | |||||
1076 | return None |
|
1078 | return None | |
1077 |
|
1079 | |||
1078 | rebasingwcp = repo['.'].rev() in rebaseset |
|
1080 | rebasingwcp = repo['.'].rev() in rebaseset | |
1079 |
ui.log("rebase", "", |
|
1081 | ui.log("rebase", "rebasing working copy parent: %r\n", rebasingwcp, | |
|
1082 | rebase_rebasing_wcp=rebasingwcp) | |||
1080 | if inmemory and rebasingwcp: |
|
1083 | if inmemory and rebasingwcp: | |
1081 | # Check these since we did not before. |
|
1084 | # Check these since we did not before. | |
1082 | cmdutil.checkunfinished(repo) |
|
1085 | cmdutil.checkunfinished(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now