Show More
@@ -536,10 +536,6 b' class dirstate(object):' | |||||
536 | if entry is not None and entry.added: |
|
536 | if entry is not None and entry.added: | |
537 | return # avoid dropping copy information (maybe?) |
|
537 | return # avoid dropping copy information (maybe?) | |
538 |
|
538 | |||
539 | parentfiledata = None |
|
|||
540 | if wc_tracked and p1_tracked: |
|
|||
541 | parentfiledata = self._get_filedata(filename) |
|
|||
542 |
|
||||
543 | self._map.reset_state( |
|
539 | self._map.reset_state( | |
544 | filename, |
|
540 | filename, | |
545 | wc_tracked, |
|
541 | wc_tracked, | |
@@ -547,16 +543,7 b' class dirstate(object):' | |||||
547 | # the underlying reference might have changed, we will have to |
|
543 | # the underlying reference might have changed, we will have to | |
548 | # check it. |
|
544 | # check it. | |
549 | has_meaningful_mtime=False, |
|
545 | has_meaningful_mtime=False, | |
550 | parentfiledata=parentfiledata, |
|
|||
551 | ) |
|
546 | ) | |
552 | if ( |
|
|||
553 | parentfiledata is not None |
|
|||
554 | and parentfiledata[2] > self._lastnormaltime |
|
|||
555 | ): |
|
|||
556 | # Remember the most recent modification timeslot for status(), |
|
|||
557 | # to make sure we won't miss future size-preserving file content |
|
|||
558 | # modifications that happen within the same timeslot. |
|
|||
559 | self._lastnormaltime = parentfiledata[2] |
|
|||
560 |
|
547 | |||
561 | @requires_parents_change |
|
548 | @requires_parents_change | |
562 | def update_file( |
|
549 | def update_file( |
General Comments 0
You need to be logged in to leave comments.
Login now