Mercurial > public > mercurial-scm > hg
diff tests/test-merge-tools.t @ 21552:61151f429a5f
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 |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Fri May 02 01:09:14 2014 +0200 +++ b/tests/test-merge-tools.t Mon May 19 01:53:34 2014 +0200 @@ -587,6 +587,54 @@ $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests +update is a merge ... + + $ beforemerge + [merge-tools] + false.whatever= + true.priority=1 + true.executable=cat + # hg update -C 1 + $ hg debugsetparent 0 + $ hg update -r 2 + merging f + revision 1 + space + revision 0 + space + revision 2 + space + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + $ aftermerge + # cat f + revision 1 + space + # hg stat + M f + +update should also have --tool + + $ beforemerge + [merge-tools] + false.whatever= + true.priority=1 + true.executable=cat + # hg update -C 1 + $ hg debugsetparent 0 + $ hg update -r 2 --tool false + merging f + merging f failed! + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges + [1] + $ aftermerge + # cat f + revision 1 + space + # hg stat + M f + ? f.orig + Default is silent simplemerge: $ beforemerge