Show More
@@ -739,12 +739,10 b' class dirstate(object):' | |||
|
739 | 739 | now = end # trust our estimate that the end is near now |
|
740 | 740 | break |
|
741 | 741 | |
|
742 | st.write(parsers.pack_dirstate(self._map._map, self._map.copymap, | |
|
743 | self._pl, now)) | |
|
742 | self._map.write(st, now) | |
|
744 | 743 | self._nonnormalset, self._otherparentset = self._map.nonnormalentries() |
|
745 | st.close() | |
|
746 | 744 | self._lastnormaltime = 0 |
|
747 |
self._dirty = |
|
|
745 | self._dirty = False | |
|
748 | 746 | |
|
749 | 747 | def _dirignore(self, f): |
|
750 | 748 | if f == '.': |
@@ -1401,3 +1399,9 b' class dirstatemap(object):' | |||
|
1401 | 1399 | p = parse_dirstate(self._map, self.copymap, st) |
|
1402 | 1400 | if not self._dirtyparents: |
|
1403 | 1401 | self.setparents(*p) |
|
1402 | ||
|
1403 | def write(self, st, now): | |
|
1404 | st.write(parsers.pack_dirstate(self._map, self.copymap, | |
|
1405 | self.parents(), now)) | |
|
1406 | st.close() | |
|
1407 | self._dirtyparents = False |
General Comments 0
You need to be logged in to leave comments.
Login now