Show More
@@ -784,7 +784,8 b' def rebase(ui, repo, **opts):' | |||
|
784 | 784 | return retcode |
|
785 | 785 | else: |
|
786 | 786 | destmap = _definedestmap(ui, repo, destf, srcf, basef, revf, |
|
787 |
destspace=destspace |
|
|
787 | destspace=destspace, | |
|
788 | inmemory=opts['inmemory']) | |
|
788 | 789 | retcode = rbsrt._preparenewrebase(destmap) |
|
789 | 790 | if retcode is not None: |
|
790 | 791 | return retcode |
@@ -804,7 +805,7 b' def rebase(ui, repo, **opts):' | |||
|
804 | 805 | rbsrt._finishrebase() |
|
805 | 806 | |
|
806 | 807 | def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None, |
|
807 | destspace=None): | |
|
808 | destspace=None, inmemory=False): | |
|
808 | 809 | """use revisions argument to define destmap {srcrev: destrev}""" |
|
809 | 810 | if revf is None: |
|
810 | 811 | revf = [] |
@@ -818,6 +819,7 b' def _definedestmap(ui, repo, destf=None,' | |||
|
818 | 819 | if revf and srcf: |
|
819 | 820 | raise error.Abort(_('cannot specify both a revision and a source')) |
|
820 | 821 | |
|
822 | if not inmemory: | |
|
821 | 823 | cmdutil.checkunfinished(repo) |
|
822 | 824 | cmdutil.bailifchanged(repo) |
|
823 | 825 |
General Comments 0
You need to be logged in to leave comments.
Login now