This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6610

tweakdefaults: make hg resolve require --re-merge flag to re-merge
ClosedPublic

Authored by valentin.gatienbaron on Jul 7 2019, 12:12 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG44e99811bea7: tweakdefaults: make hg resolve require --re-merge flag to re-merge
Summary

Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of hg resolve.

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

pulkit accepted this revision.Jul 7 2019, 2:20 PM
This revision is now accepted and ready to land.Jul 7 2019, 2:20 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)

Diff 15790

mercurial/ui.py

[commands] [commands]
# Grep working directory by default. # Grep working directory by default.
grep.all-files = True grep.all-files = True
# Refuse to perform an `hg update` that would cause a file content merge # Refuse to perform an `hg update` that would cause a file content merge
update.check = noconflict update.check = noconflict
# Show conflicts information in `hg status` # Show conflicts information in `hg status`
status.verbose = True status.verbose = True
# Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
resolve.explicit-re-merge = True
[diff] [diff]
git = 1 git = 1
showfunc = 1 showfunc = 1
word-diff = 1 word-diff = 1
""" """
samplehgrcs = { samplehgrcs = {