| changeset 8109 | 496ae1ea4698 |
| parent 7848 | 89e05c02a4af |
| child 8152 | 08e1baf924ca |
| 8108:a26d33749bd8 | 8109:496ae1ea4698 |
|---|---|
502 repo.dirstate.setbranch(p2.branch()) |
502 repo.dirstate.setbranch(p2.branch()) |
503 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
503 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
504 |
504 |
505 return stats |
505 return stats |
506 finally: |
506 finally: |
507 del wlock |
507 wlock.release() |