Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
34547:81aebcc73beb | 34548:b4955650eb57 |
---|---|
485 if old and not new: | 485 if old and not new: |
486 dropped.append(file) | 486 dropped.append(file) |
487 | 487 |
488 # Apply changes to disk | 488 # Apply changes to disk |
489 typeactions = dict((m, []) | 489 typeactions = dict((m, []) |
490 for m in 'a f g am cd dc r dm dg m e k p'.split()) | 490 for m in 'a f g am cd dc r dm dg m e k p pr'.split()) |
491 for f, (m, args, msg) in actions.iteritems(): | 491 for f, (m, args, msg) in actions.iteritems(): |
492 if m not in typeactions: | 492 if m not in typeactions: |
493 typeactions[m] = [] | 493 typeactions[m] = [] |
494 typeactions[m].append((f, args, msg)) | 494 typeactions[m].append((f, args, msg)) |
495 | 495 |