Mercurial > hg
comparison mercurial/merge.py @ 8109:496ae1ea4698
switch lock releasing in the core from gc to explicit
| author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
|---|---|
| date | Wed, 22 Apr 2009 02:01:22 +0200 |
| parents | 89e05c02a4af |
| children | 08e1baf924ca |
comparison
equal
deleted
inserted
replaced
| 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() |