Show More
@@ -2435,6 +2435,17 b' def revert(ui, repo, ctx, parents, *pats' | |||||
2435 | # So we just put them all in the same group. |
|
2435 | # So we just put them all in the same group. | |
2436 | dsadded = added |
|
2436 | dsadded = added | |
2437 |
|
2437 | |||
|
2438 | # in case of merge, files that are actually added can be reported as | |||
|
2439 | # modified, we need to post process the result | |||
|
2440 | if p2 != nullid: | |||
|
2441 | if pmf is None: | |||
|
2442 | # only need parent manifest in the merge case, | |||
|
2443 | # so do not read by default | |||
|
2444 | pmf = repo[parent].manifest() | |||
|
2445 | mergeadd = dsmodified - set(pmf) | |||
|
2446 | dsadded |= mergeadd | |||
|
2447 | dsmodified -= mergeadd | |||
|
2448 | ||||
2438 | # if f is a rename, update `names` to also revert the source |
|
2449 | # if f is a rename, update `names` to also revert the source | |
2439 | cwd = repo.getcwd() |
|
2450 | cwd = repo.getcwd() | |
2440 | for f in dsadded: |
|
2451 | for f in dsadded: |
General Comments 0
You need to be logged in to leave comments.
Login now