This is an archive of the discontinued Mercurial Phabricator instance.

resolve: add config to make hg resolve not re-merge by default
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2018, 7:01 PM.

Details

Summary

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).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for ui.tweakdefaults, @durin42 what do you think?

mercurial/commands.py
4566

ui.configbool() is better. Can you followup?

This revision was automatically updated to reflect the committed changes.

I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for ui.tweakdefaults, @durin42 what do you think?

I think I’m generally fine with that.