D1222: merge: add a config option to disable path conflict checking
sid0 (Siddharth Agarwal)
phabricator at mercurial-scm.org
Tue Oct 24 15:08:28 EDT 2017
sid0 updated this revision to Diff 3081.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1222?vs=3073&id=3081
REVISION DETAIL
https://phab.mercurial-scm.org/D1222
AFFECTED FILES
mercurial/configitems.py
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -693,6 +693,7 @@
abortconflicts = set()
unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')
+ pathconfig = repo.ui.configbool('experimental', 'merge.checkpathconflicts')
if not force:
def collectconflicts(conflicts, config):
if config == 'abort':
@@ -704,7 +705,7 @@
if m in ('c', 'dc'):
if _checkunknownfile(repo, wctx, mctx, f):
fileconflicts.add(f)
- elif f not in wctx:
+ elif pathconfig and f not in wctx:
path = _checkunknowndirs(repo, f)
if path is not None:
pathconflicts.add(path)
@@ -1139,8 +1140,9 @@
actions[f] = ('dc', (None, f, f, False, pa.node()),
"prompt deleted/changed")
- # If we are merging, look for path conflicts.
- checkpathconflicts(repo, wctx, p2, actions)
+ if repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
+ # If we are merging, look for path conflicts.
+ checkpathconflicts(repo, wctx, p2, actions)
return actions, diverge, renamedelete
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -575,6 +575,9 @@
coreconfigitem('merge', 'checkignored',
default='abort',
)
+coreconfigitem('experimental', 'merge.checkpathconflicts',
+ default=True,
+)
coreconfigitem('merge', 'followcopies',
default=True,
)
To: sid0, #hg-reviewers
Cc: lothiraldan, mercurial-devel
More information about the Mercurial-devel
mailing list