mercurial/pure/parsers.py

47930:7c37d153c22d

        This is only True is the file is currently tracked.

        Should only be set if a merge is in progress in the dirstate
        """
        return self.v1_state() == b'n' and self.v1_size() == FROM_P2

    @property
    def from_p2_removed(self):
        """True if the file has been removed, but was "from_p2" initially

47931:7033d1d5bd18

        This is only True is the file is currently tracked.

        Should only be set if a merge is in progress in the dirstate
        """
        return self._wc_tracked and self._clean_p2

    @property
    def from_p2_removed(self):
        """True if the file has been removed, but was "from_p2" initially