Show More
@@ -452,7 +452,7 b' def recordupdates(repo, action, branchme' | |||||
452 | repo.dirstate.forget(f) |
|
452 | repo.dirstate.forget(f) | |
453 | elif m == "f": # forget |
|
453 | elif m == "f": # forget | |
454 | repo.dirstate.forget(f) |
|
454 | repo.dirstate.forget(f) | |
455 |
elif m |
|
455 | elif m in "ge": # get or exec change | |
456 | if branchmerge: |
|
456 | if branchmerge: | |
457 | repo.dirstate.normaldirty(f) |
|
457 | repo.dirstate.normaldirty(f) | |
458 | else: |
|
458 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now