Mercurial > hg
diff mercurial/sparse.py @ 34548:b4955650eb57
merge: add merge action 'pr' to rename files during update
Add a new merge action to handle a path conflict by renaming the conflicting
file to a safe name.
The rename is just to avoid problems on the filesystem. The conflict is still
considered unresolved until the user marks the original path as resolved.
Differential Revision: https://phab.mercurial-scm.org/D777
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | 81aebcc73beb |
children | 72b91f905065 |
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 @@ -487,7 +487,7 @@ # Apply changes to disk typeactions = dict((m, []) - for m in 'a f g am cd dc r dm dg m e k p'.split()) + for m in 'a f g am cd dc r dm dg m e k p pr'.split()) for f, (m, args, msg) in actions.iteritems(): if m not in typeactions: typeactions[m] = []