Mercurial > hg

comparison tests/test-merge-tools.t @ 21552:61151f429a5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 19 May 2014 01:53:34 +0200
parents 25d5a9ecbb85
children 9c35f3a8cac4
comparison
equal deleted inserted replaced
21551:bde505f47141 21552:61151f429a5f
585 M f 585 M f
586 ? f.orig 586 ? f.orig
587 587
588 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests 588 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
589 589
590 update is a merge ...
591
592 $ beforemerge
593 [merge-tools]
594 false.whatever=
595 true.priority=1
596 true.executable=cat
597 # hg update -C 1
598 $ hg debugsetparent 0
599 $ hg update -r 2
600 merging f
601 revision 1
602 space
603 revision 0
604 space
605 revision 2
606 space
607 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
608 $ aftermerge
609 # cat f
610 revision 1
611 space
612 # hg stat
613 M f
614
615 update should also have --tool
616
617 $ beforemerge
618 [merge-tools]
619 false.whatever=
620 true.priority=1
621 true.executable=cat
622 # hg update -C 1
623 $ hg debugsetparent 0
624 $ hg update -r 2 --tool false
625 merging f
626 merging f failed!
627 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
628 use 'hg resolve' to retry unresolved file merges
629 [1]
630 $ aftermerge
631 # cat f
632 revision 1
633 space
634 # hg stat
635 M f
636 ? f.orig
637
590 Default is silent simplemerge: 638 Default is silent simplemerge:
591 639
592 $ beforemerge 640 $ beforemerge
593 [merge-tools] 641 [merge-tools]
594 false.whatever= 642 false.whatever=