Show More
@@ -854,7 +854,7 b' def _dryrunrebase(ui, repo, opts):' | |||||
854 | rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) |
|
854 | rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) | |
855 | confirm = opts.get('confirm') |
|
855 | confirm = opts.get('confirm') | |
856 | if confirm: |
|
856 | if confirm: | |
857 |
ui.status(_('starting rebase |
|
857 | ui.status(_('starting in-memory rebase\n')) | |
858 | else: |
|
858 | else: | |
859 | ui.status(_('starting dry-run rebase; repository will not be ' |
|
859 | ui.status(_('starting dry-run rebase; repository will not be ' | |
860 | 'changed\n')) |
|
860 | 'changed\n')) |
@@ -369,7 +369,7 b' Test --confirm option when there are no ' | |||||
369 | $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF |
|
369 | $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF | |
370 | > n |
|
370 | > n | |
371 | > EOF |
|
371 | > EOF | |
372 |
starting rebase |
|
372 | starting in-memory rebase | |
373 | rebasing 2:177f92b77385 "c" |
|
373 | rebasing 2:177f92b77385 "c" | |
374 | rebasing 3:055a42cdd887 "d" |
|
374 | rebasing 3:055a42cdd887 "d" | |
375 | rebasing 4:e860deea161a "e" |
|
375 | rebasing 4:e860deea161a "e" | |
@@ -400,7 +400,7 b' Test --confirm option when there are no ' | |||||
400 | $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF |
|
400 | $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF | |
401 | > y |
|
401 | > y | |
402 | > EOF |
|
402 | > EOF | |
403 |
starting rebase |
|
403 | starting in-memory rebase | |
404 | rebasing 2:177f92b77385 "c" |
|
404 | rebasing 2:177f92b77385 "c" | |
405 | rebasing 3:055a42cdd887 "d" |
|
405 | rebasing 3:055a42cdd887 "d" | |
406 | rebasing 4:e860deea161a "e" |
|
406 | rebasing 4:e860deea161a "e" | |
@@ -475,7 +475,7 b' Test --confirm option when there is a co' | |||||
475 | $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF |
|
475 | $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF | |
476 | > n |
|
476 | > n | |
477 | > EOF |
|
477 | > EOF | |
478 |
starting rebase |
|
478 | starting in-memory rebase | |
479 | rebasing 4:e860deea161a "e" |
|
479 | rebasing 4:e860deea161a "e" | |
480 | merging e |
|
480 | merging e | |
481 | hit a merge conflict |
|
481 | hit a merge conflict | |
@@ -516,7 +516,7 b' Test --confirm option when there is a co' | |||||
516 | $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF |
|
516 | $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF | |
517 | > y |
|
517 | > y | |
518 | > EOF |
|
518 | > EOF | |
519 |
starting rebase |
|
519 | starting in-memory rebase | |
520 | rebasing 4:e860deea161a "e" |
|
520 | rebasing 4:e860deea161a "e" | |
521 | merging e |
|
521 | merging e | |
522 | hit a merge conflict |
|
522 | hit a merge conflict |
General Comments 0
You need to be logged in to leave comments.
Login now