equal
deleted
inserted
replaced
2572 # If we're updating to a location, clean up any stale temporary includes |
2572 # If we're updating to a location, clean up any stale temporary includes |
2573 # (ex: this happens during hg rebase --abort). |
2573 # (ex: this happens during hg rebase --abort). |
2574 if not branchmerge: |
2574 if not branchmerge: |
2575 sparse.prunetemporaryincludes(repo) |
2575 sparse.prunetemporaryincludes(repo) |
2576 |
2576 |
2577 if not partial: |
2577 if updatedirstate: |
2578 repo.hook( |
2578 repo.hook( |
2579 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount |
2579 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount |
2580 ) |
2580 ) |
2581 return stats |
2581 return stats |
2582 |
2582 |