Show More
@@ -2149,10 +2149,10 b' def _update(' | |||||
2149 | if not branchmerge: |
|
2149 | if not branchmerge: | |
2150 | repo.dirstate.setbranch(p2.branch()) |
|
2150 | repo.dirstate.setbranch(p2.branch()) | |
2151 |
|
2151 | |||
2152 | # If we're updating to a location, clean up any stale temporary includes |
|
2152 | # If we're updating to a location, clean up any stale temporary includes | |
2153 | # (ex: this happens during hg rebase --abort). |
|
2153 | # (ex: this happens during hg rebase --abort). | |
2154 | if not branchmerge: |
|
2154 | if not branchmerge: | |
2155 | sparse.prunetemporaryincludes(repo) |
|
2155 | sparse.prunetemporaryincludes(repo) | |
2156 |
|
2156 | |||
2157 | if updatedirstate: |
|
2157 | if updatedirstate: | |
2158 | repo.hook( |
|
2158 | repo.hook( |
General Comments 0
You need to be logged in to leave comments.
Login now