equal
deleted
inserted
replaced
160 entry = self.get(f) |
160 entry = self.get(f) |
161 if entry is None: |
161 if entry is None: |
162 return False |
162 return False |
163 else: |
163 else: |
164 self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) |
164 self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) |
165 if not entry.merged: |
165 if not entry.p2_info: |
166 self.copymap.pop(f, None) |
166 self.copymap.pop(f, None) |
167 entry.set_untracked() |
167 entry.set_untracked() |
168 self._refresh_entry(f, entry) |
168 self._refresh_entry(f, entry) |
169 return True |
169 return True |
170 |
170 |