##// END OF EJS Templates
dirstate: use `reset_state` to drop file in `update_file_p1`...
marmoute -
r48813:bac82c2c default
parent child Browse files
Show More
@@ -556,7 +556,8 b' class dirstate(object):'
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:
General Comments 0
You need to be logged in to leave comments. Login now