Show More
@@ -872,9 +872,6 def _dryrunrebase(ui, repo, opts): | |||||
872 | rbsrt._prepareabortorcontinue(isabort=True, backup=False, |
|
872 | rbsrt._prepareabortorcontinue(isabort=True, backup=False, | |
873 | suppwarns=True) |
|
873 | suppwarns=True) | |
874 | needsabort = False |
|
874 | needsabort = False | |
875 | if not ui.promptchoice(_(b'apply changes (yn)?' |
|
|||
876 | b'$$ &Yes $$ &No')): |
|
|||
877 | return _dorebase(ui, repo, opts, inmemory=False) |
|
|||
878 | return 1 |
|
875 | return 1 | |
879 | else: |
|
876 | else: | |
880 | if confirm: |
|
877 | if confirm: |
@@ -472,14 +472,11 Test --confirm option when there is a co | |||||
472 | o 0:cb9a9f314b8b test |
|
472 | o 0:cb9a9f314b8b test | |
473 | a |
|
473 | a | |
474 |
|
474 | |||
475 |
$ hg rebase -s 4 -d . --keep -- |
|
475 | $ hg rebase -s 4 -d . --keep --confirm | |
476 | > n |
|
|||
477 | > EOF |
|
|||
478 | starting in-memory rebase |
|
476 | starting in-memory rebase | |
479 | rebasing 4:e860deea161a "e" |
|
477 | rebasing 4:e860deea161a "e" | |
480 | merging e |
|
478 | merging e | |
481 | hit a merge conflict |
|
479 | hit a merge conflict | |
482 | apply changes (yn)? n |
|
|||
483 | [1] |
|
480 | [1] | |
484 | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" |
|
481 | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | |
485 | @ 9:906d72f66a59 test |
|
482 | @ 9:906d72f66a59 test | |
@@ -512,58 +509,3 Test --confirm option when there is a co | |||||
512 | o 0:cb9a9f314b8b test |
|
509 | o 0:cb9a9f314b8b test | |
513 | a |
|
510 | a | |
514 |
|
511 | |||
515 |
|
||||
516 | $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF |
|
|||
517 | > y |
|
|||
518 | > EOF |
|
|||
519 | starting in-memory rebase |
|
|||
520 | rebasing 4:e860deea161a "e" |
|
|||
521 | merging e |
|
|||
522 | hit a merge conflict |
|
|||
523 | apply changes (yn)? y |
|
|||
524 | rebasing 4:e860deea161a "e" |
|
|||
525 | merging e |
|
|||
526 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
|||
527 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
|||
528 | [1] |
|
|||
529 |
|
||||
530 | $ echo e>e |
|
|||
531 | $ hg resolve --mark --all |
|
|||
532 | (no more unresolved files) |
|
|||
533 | continue: hg rebase --continue |
|
|||
534 | $ hg rebase --continue |
|
|||
535 | rebasing 4:e860deea161a "e" |
|
|||
536 | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" |
|
|||
537 | o 10:9fa3731dd6df test |
|
|||
538 | | e |
|
|||
539 | | |
|
|||
540 | @ 9:906d72f66a59 test |
|
|||
541 | | conflict with e |
|
|||
542 | | |
|
|||
543 | o 8:12cbf031f469 test |
|
|||
544 | | d |
|
|||
545 | | |
|
|||
546 | o 7:c83b1da5b1ae test |
|
|||
547 | | c |
|
|||
548 | | |
|
|||
549 | o 6:baf10c5166d4 test |
|
|||
550 | | g |
|
|||
551 | | |
|
|||
552 | o 5:6343ca3eff20 test |
|
|||
553 | | f |
|
|||
554 | | |
|
|||
555 | | o 4:e860deea161a test |
|
|||
556 | | | e |
|
|||
557 | | | |
|
|||
558 | | o 3:055a42cdd887 test |
|
|||
559 | | | d |
|
|||
560 | | | |
|
|||
561 | | o 2:177f92b77385 test |
|
|||
562 | |/ c |
|
|||
563 | | |
|
|||
564 | o 1:d2ae7f538514 test |
|
|||
565 | | b |
|
|||
566 | | |
|
|||
567 | o 0:cb9a9f314b8b test |
|
|||
568 | a |
|
|||
569 |
|
General Comments 0
You need to be logged in to leave comments.
Login now