equal
deleted
inserted
replaced
1277 _('note: commit message saved in %s\n') % msgfn) |
1277 _('note: commit message saved in %s\n') % msgfn) |
1278 raise |
1278 raise |
1279 |
1279 |
1280 # update bookmarks, dirstate and mergestate |
1280 # update bookmarks, dirstate and mergestate |
1281 bookmarks.update(self, [p1, p2], ret) |
1281 bookmarks.update(self, [p1, p2], ret) |
1282 for f in changes[0] + changes[1]: |
1282 cctx.markcommitted(ret) |
1283 self.dirstate.normal(f) |
|
1284 for f in changes[2]: |
|
1285 self.dirstate.drop(f) |
|
1286 self.dirstate.setparents(ret) |
|
1287 ms.reset() |
1283 ms.reset() |
1288 finally: |
1284 finally: |
1289 wlock.release() |
1285 wlock.release() |
1290 |
1286 |
1291 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): |
1287 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): |