Mercurial > hg
diff mercurial/sparse.py @ 34547:81aebcc73beb
merge: add merge action 'p' to record path conflicts during update
Add a new merge action to record path conflicts. A status message is
printed, and the path conflict is added to the merge state.
Differential Revision: https://phab.mercurial-scm.org/D776
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | e1c56486d1aa |
| children | b4955650eb57 |
line wrap: on
line diff
--- a/mercurial/sparse.py Mon Oct 02 14:05:30 2017 -0700 +++ b/mercurial/sparse.py Mon Oct 02 14:05:30 2017 -0700 @@ -486,7 +486,8 @@ dropped.append(file) # Apply changes to disk - typeactions = dict((m, []) for m in 'a f g am cd dc r dm dg m e k'.split()) + typeactions = dict((m, []) + for m in 'a f g am cd dc r dm dg m e k p'.split()) for f, (m, args, msg) in actions.iteritems(): if m not in typeactions: typeactions[m] = []