Mercurial > hg
comparison tests/test-merge-tools.t @ 48431:6b1049d71c3e
filemerge: make `_filemerge()` do both premerge and merge
This patch removes the `premerge` argument from `_filemerge()` and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.
Differential Revision: https://phab.mercurial-scm.org/D11859
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 21:41:43 -0800 |
| parents | ea8bfd33c22a |
| children | c852950f0e72 |
comparison
equal
deleted
inserted
replaced
| 48430:921853391276 | 48431:6b1049d71c3e |
|---|---|
| 576 true.executable=cat | 576 true.executable=cat |
| 577 # hg update -C 1 | 577 # hg update -C 1 |
| 578 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool | 578 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
| 579 couldn't find merge tool true (for pattern f) | 579 couldn't find merge tool true (for pattern f) |
| 580 merging f | 580 merging f |
| 581 couldn't find merge tool true (for pattern f) | |
| 582 merging f failed! | 581 merging f failed! |
| 583 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 582 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 584 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 583 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 585 [1] | 584 [1] |
| 586 $ aftermerge | 585 $ aftermerge |
| 602 true.executable=cat | 601 true.executable=cat |
| 603 # hg update -C 1 | 602 # hg update -C 1 |
| 604 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool | 603 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
| 605 couldn't find merge tool true (for pattern f) | 604 couldn't find merge tool true (for pattern f) |
| 606 merging f | 605 merging f |
| 607 couldn't find merge tool true (for pattern f) | |
| 608 merging f failed! | 606 merging f failed! |
| 609 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 607 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 610 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 608 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 611 [1] | 609 [1] |
| 612 $ aftermerge | 610 $ aftermerge |
| 1835 missingbinary.executable=doesnotexist | 1833 missingbinary.executable=doesnotexist |
| 1836 # hg update -C 1 | 1834 # hg update -C 1 |
| 1837 $ hg merge -y -r 2 --config ui.merge=missingbinary | 1835 $ hg merge -y -r 2 --config ui.merge=missingbinary |
| 1838 couldn't find merge tool missingbinary (for pattern f) | 1836 couldn't find merge tool missingbinary (for pattern f) |
| 1839 merging f | 1837 merging f |
| 1840 couldn't find merge tool missingbinary (for pattern f) | |
| 1841 revision 1 | 1838 revision 1 |
| 1842 space | 1839 space |
| 1843 revision 0 | 1840 revision 0 |
| 1844 space | 1841 space |
| 1845 revision 2 | 1842 revision 2 |