equal
deleted
inserted
replaced
220 if entry.merged: # merge |
220 if entry.merged: # merge |
221 size = NONNORMAL |
221 size = NONNORMAL |
222 elif entry.from_p2: |
222 elif entry.from_p2: |
223 size = FROM_P2 |
223 size = FROM_P2 |
224 self.otherparentset.add(f) |
224 self.otherparentset.add(f) |
225 if size == 0: |
225 if entry is not None and not (entry.merged or entry.from_p2): |
226 self.copymap.pop(f, None) |
226 self.copymap.pop(f, None) |
227 |
227 |
228 if entry is not None and not entry.removed and "_dirs" in self.__dict__: |
228 if entry is not None and not entry.removed and "_dirs" in self.__dict__: |
229 self._dirs.delpath(f) |
229 self._dirs.delpath(f) |
230 if entry is None and "_alldirs" in self.__dict__: |
230 if entry is None and "_alldirs" in self.__dict__: |