This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5225

tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken
ClosedPublic

Authored by spectral on Nov 5 2018, 6:17 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8239d4e5d05f: tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken
Summary

See issue6020 for the current case. I don't want to continue attempting to fix
this on the stable branch, so I'm removing from tweakdefaults and will send
fixes meant for the default branch and 4.9.

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

spectral created this revision.Nov 5 2018, 6:17 PM
spectral added a comment.Nov 5 2018, 6:18 PM

(Please queue this on stable, thanks!)

Closed by commit rHG8239d4e5d05f: tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken (authored by spectral). · Explain WhyNov 5 2018, 8:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (3 lines)

Diff 12438

mercurial/ui.py

# Grep working directory by default. # Grep working directory by default.
grep.all-files = True grep.all-files = True
# Make `hg status` emit cwd-relative paths by default. # Make `hg status` emit cwd-relative paths by default.
status.relative = yes status.relative = yes
# 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
# Refuse to perform `hg resolve --mark` on files that still have conflict
# markers
resolve.mark-check = abort
[diff] [diff]
git = 1 git = 1
showfunc = 1 showfunc = 1
word-diff = 1 word-diff = 1
""" """
samplehgrcs = { samplehgrcs = {