Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 34546:e4cf957bf7ce | 34547:81aebcc73beb |
|---|---|
| 484 new = sparsematch(file) | 484 new = sparsematch(file) |
| 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, []) for m in 'a f g am cd dc r dm dg m e k'.split()) | 489 typeactions = dict((m, []) |
| 490 for m in 'a f g am cd dc r dm dg m e k p'.split()) | |
| 490 for f, (m, args, msg) in actions.iteritems(): | 491 for f, (m, args, msg) in actions.iteritems(): |
| 491 if m not in typeactions: | 492 if m not in typeactions: |
| 492 typeactions[m] = [] | 493 typeactions[m] = [] |
| 493 typeactions[m].append((f, args, msg)) | 494 typeactions[m].append((f, args, msg)) |
| 494 | 495 |