Show More
@@ -818,7 +818,7 b' def rebase(ui, repo, **opts):' | |||||
818 | if dryrun and confirm: |
|
818 | if dryrun and confirm: | |
819 | raise error.Abort(_('cannot specify both --confirm and --dry-run')) |
|
819 | raise error.Abort(_('cannot specify both --confirm and --dry-run')) | |
820 |
|
820 | |||
821 |
if action |
|
821 | if action or repo.currenttransaction() is not None: | |
822 | # in-memory rebase is not compatible with resuming rebases. |
|
822 | # in-memory rebase is not compatible with resuming rebases. | |
823 | # (Or if it is run within a transaction, since the restart logic can |
|
823 | # (Or if it is run within a transaction, since the restart logic can | |
824 | # fail the entire transaction.) |
|
824 | # fail the entire transaction.) |
General Comments 0
You need to be logged in to leave comments.
Login now