Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | 1609a5afc4f5 |
| children | 0217d66846f7 |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Oct 02 14:05:30 2017 -0700 +++ b/mercurial/merge.py Mon Oct 02 14:05:30 2017 -0700 @@ -676,6 +676,7 @@ choose a different action. """ fileconflicts = set() + pathconflicts = set() warnconflicts = set() abortconflicts = set() unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') @@ -691,11 +692,15 @@ if m in ('c', 'dc'): if _checkunknownfile(repo, wctx, mctx, f): fileconflicts.add(f) + elif f not in wctx: + path = _checkunknowndirs(repo, f) + if path is not None: + pathconflicts.add(path) elif m == 'dg': if _checkunknownfile(repo, wctx, mctx, f, args[0]): fileconflicts.add(f) - allconflicts = fileconflicts + allconflicts = fileconflicts | pathconflicts ignoredconflicts = set([c for c in allconflicts if repo.dirstate._ignore(c)]) unknownconflicts = allconflicts - ignoredconflicts @@ -745,8 +750,9 @@ repo.ui.warn(_("%s: replacing untracked file\n") % f) for f, (m, args, msg) in actions.iteritems(): - backup = f in fileconflicts if m == 'c': + backup = (f in fileconflicts or f in pathconflicts or + any(p in pathconflicts for p in util.finddirs(f))) flags, = args actions[f] = ('g', (flags, backup), msg)