Show More
@@ -2475,16 +2475,16 b' class localrepository(object):' | |||||
2475 | parent2=hookp2) |
|
2475 | parent2=hookp2) | |
2476 | tr = self.transaction('commit') |
|
2476 | tr = self.transaction('commit') | |
2477 | ret = self.commitctx(cctx, True) |
|
2477 | ret = self.commitctx(cctx, True) | |
|
2478 | # update bookmarks, dirstate and mergestate | |||
|
2479 | bookmarks.update(self, [p1, p2], ret) | |||
|
2480 | cctx.markcommitted(ret) | |||
|
2481 | ms.reset() | |||
|
2482 | tr.close() | |||
2478 | except: # re-raises |
|
2483 | except: # re-raises | |
2479 | if edited: |
|
2484 | if edited: | |
2480 | self.ui.write( |
|
2485 | self.ui.write( | |
2481 | _('note: commit message saved in %s\n') % msgfn) |
|
2486 | _('note: commit message saved in %s\n') % msgfn) | |
2482 | raise |
|
2487 | raise | |
2483 | # update bookmarks, dirstate and mergestate |
|
|||
2484 | bookmarks.update(self, [p1, p2], ret) |
|
|||
2485 | cctx.markcommitted(ret) |
|
|||
2486 | ms.reset() |
|
|||
2487 | tr.close() |
|
|||
2488 |
|
2488 | |||
2489 | finally: |
|
2489 | finally: | |
2490 | lockmod.release(tr, lock, wlock) |
|
2490 | lockmod.release(tr, lock, wlock) |
General Comments 0
You need to be logged in to leave comments.
Login now