equal
deleted
inserted
replaced
1035 # update bookmarks, dirstate and mergestate |
1035 # update bookmarks, dirstate and mergestate |
1036 bookmarks.update(self, p1, ret) |
1036 bookmarks.update(self, p1, ret) |
1037 for f in changes[0] + changes[1]: |
1037 for f in changes[0] + changes[1]: |
1038 self.dirstate.normal(f) |
1038 self.dirstate.normal(f) |
1039 for f in changes[2]: |
1039 for f in changes[2]: |
1040 self.dirstate.forget(f) |
1040 self.dirstate.drop(f) |
1041 self.dirstate.setparents(ret) |
1041 self.dirstate.setparents(ret) |
1042 ms.reset() |
1042 ms.reset() |
1043 finally: |
1043 finally: |
1044 wlock.release() |
1044 wlock.release() |
1045 |
1045 |