Mercurial > hg
diff tests/test-resolve.t @ 39393:56469d475341
resolve: add config to make hg resolve not re-merge by default
Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).
Differential Revision: https://phab.mercurial-scm.org/D4379
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Sun, 26 Aug 2018 16:42:28 -0400 |
parents | 5d00e6061ba2 |
children | 213c0493cea0 |
line wrap: on
line diff
--- a/tests/test-resolve.t Sun Aug 26 15:52:34 2018 -0400 +++ b/tests/test-resolve.t Sun Aug 26 16:42:28 2018 -0400 @@ -448,12 +448,22 @@ U file1 R file2 $ hg resolve --mark --re-merge - abort: too many options specified + abort: too many actions specified [255] $ hg resolve --re-merge --all merging file1 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') [1] +Explicit re-merge + $ hg resolve --unmark file1 + $ hg resolve --config commands.resolve.explicit-re-merge=1 --all + abort: no action specified + (use --mark, --unmark, --list or --re-merge) + [255] + $ hg resolve --config commands.resolve.explicit-re-merge=1 --re-merge --all + merging file1 + warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') + [1] $ cd ..