Mercurial > evolve
comparison hgext/evolve.py @ 1554:59f5bb1f1877
transaction: fix release order in 'rewrite'
This was wrong for quite sometime.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 11 Dec 2015 10:49:29 +0000 |
| parents | 425c0700aabd |
| children | 0ff262537f98 |
comparison
equal
deleted
inserted
replaced
| 1553:ed63bf62ff02 | 1554:59f5bb1f1877 |
|---|---|
| 889 updatebookmarks(newid) | 889 updatebookmarks(newid) |
| 890 | 890 |
| 891 tr.close() | 891 tr.close() |
| 892 return newid, created | 892 return newid, created |
| 893 finally: | 893 finally: |
| 894 lockmod.release(lock, wlock, tr) | 894 lockmod.release(tr, lock, wlock) |
| 895 | 895 |
| 896 class MergeFailure(error.Abort): | 896 class MergeFailure(error.Abort): |
| 897 pass | 897 pass |
| 898 | 898 |
| 899 def relocate(repo, orig, dest, keepbranch=False): | 899 def relocate(repo, orig, dest, keepbranch=False): |