Show More
@@ -2976,11 +2976,11 b' def revert(ui, repo, ctx, parents, *pats' | |||
|
2976 | 2976 | clean = set(changes.clean) |
|
2977 | 2977 | modadded = set() |
|
2978 | 2978 | |
|
2979 | # split between files known in target manifest and the others | |
|
2980 | smf = set(mf) | |
|
2981 | ||
|
2982 | 2979 | # determine the exact nature of the deleted changesets |
|
2983 |
deladded = _deleted |
|
|
2980 | deladded = set(_deleted) | |
|
2981 | for path in _deleted: | |
|
2982 | if path in mf: | |
|
2983 | deladded.remove(path) | |
|
2984 | 2984 | deleted = _deleted - deladded |
|
2985 | 2985 | |
|
2986 | 2986 | # We need to account for the state of the file in the dirstate, |
@@ -3024,7 +3024,10 b' def revert(ui, repo, ctx, parents, *pats' | |||
|
3024 | 3024 | # in case of merge, files that are actually added can be reported as |
|
3025 | 3025 | # modified, we need to post process the result |
|
3026 | 3026 | if p2 != nullid: |
|
3027 |
mergeadd = dsmodified |
|
|
3027 | mergeadd = set(dsmodified) | |
|
3028 | for path in dsmodified: | |
|
3029 | if path in mf: | |
|
3030 | mergeadd.remove(path) | |
|
3028 | 3031 | dsadded |= mergeadd |
|
3029 | 3032 | dsmodified -= mergeadd |
|
3030 | 3033 |
General Comments 0
You need to be logged in to leave comments.
Login now