equal
deleted
inserted
replaced
554 # the underlying reference might have changed, we will have to |
554 # the underlying reference might have changed, we will have to |
555 # check it. |
555 # check it. |
556 possibly_dirty = True |
556 possibly_dirty = True |
557 elif not (p1_tracked or wc_tracked): |
557 elif not (p1_tracked or wc_tracked): |
558 # the file is no longer relevant to anyone |
558 # the file is no longer relevant to anyone |
559 if self._map.dropfile(filename): |
559 if self._map.get(filename) is not None: |
|
560 self._map.reset_state(filename) |
560 self._dirty = True |
561 self._dirty = True |
561 self._updatedfiles.add(filename) |
562 self._updatedfiles.add(filename) |
562 elif (not p1_tracked) and wc_tracked: |
563 elif (not p1_tracked) and wc_tracked: |
563 if entry is not None and entry.added: |
564 if entry is not None and entry.added: |
564 return # avoid dropping copy information (maybe?) |
565 return # avoid dropping copy information (maybe?) |