equal
deleted
inserted
replaced
731 # XXX this should probably be dealt with a a lower level |
731 # XXX this should probably be dealt with a a lower level |
732 # (see `merged_removed` and `from_p2_removed`) |
732 # (see `merged_removed` and `from_p2_removed`) |
733 if entry.merged_removed or entry.from_p2_removed: |
733 if entry.merged_removed or entry.from_p2_removed: |
734 source = self._map.copymap.get(f) |
734 source = self._map.copymap.get(f) |
735 if entry.merged_removed: |
735 if entry.merged_removed: |
736 self._merge(f) |
736 self._otherparent(f) |
737 elif entry.from_p2_removed: |
737 elif entry.from_p2_removed: |
738 self._otherparent(f) |
738 self._otherparent(f) |
739 if source is not None: |
739 if source is not None: |
740 self.copy(source, f) |
740 self.copy(source, f) |
741 return |
741 return |
759 |
759 |
760 def _add(self, filename): |
760 def _add(self, filename): |
761 """internal function to mark a file as added""" |
761 """internal function to mark a file as added""" |
762 self._addpath(filename, added=True) |
762 self._addpath(filename, added=True) |
763 self._map.copymap.pop(filename, None) |
763 self._map.copymap.pop(filename, None) |
764 |
|
765 def _merge(self, f): |
|
766 if not self.in_merge: |
|
767 return self._normallookup(f) |
|
768 return self._otherparent(f) |
|
769 |
764 |
770 def _drop(self, filename): |
765 def _drop(self, filename): |
771 """internal function to drop a file from the dirstate""" |
766 """internal function to drop a file from the dirstate""" |
772 if self._map.dropfile(filename): |
767 if self._map.dropfile(filename): |
773 self._dirty = True |
768 self._dirty = True |