Mercurial > hg > mercurial-source

comparison tests/test-merge-tools.t @ 27802:4ab69be0ea15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 11:17:18 -0800
parents 7a8e9a985c3b
children 88d5db4b155c
comparison
equal deleted inserted replaced
27801:296d55def9c4 27802:4ab69be0ea15
530 true.priority=1 530 true.priority=1
531 true.executable=cat 531 true.executable=cat
532 # hg update -C 1 532 # hg update -C 1
533 $ hg merge -r 2 --config ui.merge=internal:prompt 533 $ hg merge -r 2 --config ui.merge=internal:prompt
534 no tool found to merge f 534 no tool found to merge f
535 keep (l)ocal or take (o)ther? l 535 keep (l)ocal, take (o)ther, or leave (u)nresolved? l
536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
537 (branch merge, don't forget to commit) 537 (branch merge, don't forget to commit)
538 $ aftermerge 538 $ aftermerge
539 # cat f 539 # cat f
540 revision 1 540 revision 1
541 space 541 space
542 # hg stat 542 # hg stat
543 M f 543 M f
544 # hg resolve --list 544 # hg resolve --list
545 R f 545 R f
546
547 ui.merge specifies :prompt, with 'leave unresolved' chosen
548
549 $ beforemerge
550 [merge-tools]
551 false.whatever=
552 true.priority=1
553 true.executable=cat
554 # hg update -C 1
555 $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
556 > u
557 > EOF
558 no tool found to merge f
559 keep (l)ocal, take (o)ther, or leave (u)nresolved? u
560 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
561 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
562 [1]
563 $ aftermerge
564 # cat f
565 revision 1
566 space
567 # hg stat
568 M f
569 # hg resolve --list
570 U f
546 571
547 prompt with EOF 572 prompt with EOF
548 573
549 $ beforemerge 574 $ beforemerge
550 [merge-tools] 575 [merge-tools]
552 true.priority=1 577 true.priority=1
553 true.executable=cat 578 true.executable=cat
554 # hg update -C 1 579 # hg update -C 1
555 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true 580 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
556 no tool found to merge f 581 no tool found to merge f
557 keep (l)ocal or take (o)ther? 582 keep (l)ocal, take (o)ther, or leave (u)nresolved?
558 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 583 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
559 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 584 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
560 [1] 585 [1]
561 $ aftermerge 586 $ aftermerge
562 # cat f 587 # cat f
566 M f 591 M f
567 # hg resolve --list 592 # hg resolve --list
568 U f 593 U f
569 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true 594 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
570 no tool found to merge f 595 no tool found to merge f
571 keep (l)ocal or take (o)ther? 596 keep (l)ocal, take (o)ther, or leave (u)nresolved?
572 [1] 597 [1]
573 $ aftermerge 598 $ aftermerge
574 # cat f 599 # cat f
575 revision 1 600 revision 1
576 space 601 space
580 # hg resolve --list 605 # hg resolve --list
581 U f 606 U f
582 $ rm f 607 $ rm f
583 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true 608 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
584 no tool found to merge f 609 no tool found to merge f
585 keep (l)ocal or take (o)ther? 610 keep (l)ocal, take (o)ther, or leave (u)nresolved?
586 [1] 611 [1]
587 $ aftermerge 612 $ aftermerge
588 # cat f 613 # cat f
589 revision 1 614 revision 1
590 space 615 space
592 M f 617 M f
593 # hg resolve --list 618 # hg resolve --list
594 U f 619 U f
595 $ hg resolve --all --config ui.merge=internal:prompt 620 $ hg resolve --all --config ui.merge=internal:prompt
596 no tool found to merge f 621 no tool found to merge f
597 keep (l)ocal or take (o)ther? l 622 keep (l)ocal, take (o)ther, or leave (u)nresolved? l
598 (no more unresolved files) 623 (no more unresolved files)
599 $ aftermerge 624 $ aftermerge
600 # cat f 625 # cat f
601 revision 1 626 revision 1
602 space 627 space