# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1633051800 -7200
# Node ID c29d312657d2e504d0dbfb662ea5dff3f4128e49
# Parent  8f88307f8e07a7bb39ba8d332f05e9053e3295f8
dirstate-item: drop the `merged` property

It has no user anymore.

Differential Revision: https://phab.mercurial-scm.org/D11597

diff -r 8f88307f8e07 -r c29d312657d2 mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py	Fri Oct 01 03:29:33 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:30:00 2021 +0200
@@ -314,14 +314,6 @@
         return self._wc_tracked and self._p2_info
 
     @property
-    def merged(self):
-        """True if the file has been merged
-
-        Should only be set if a merge is in progress in the dirstate
-        """
-        return self._wc_tracked and self._p1_tracked and self._p2_info
-
-    @property
     def removed(self):
         """True if the file has been removed"""
         return not self._wc_tracked and (self._p1_tracked or self._p2_info)
diff -r 8f88307f8e07 -r c29d312657d2 rust/hg-core/src/dirstate/entry.rs
--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:29:33 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:30:00 2021 +0200
@@ -169,11 +169,6 @@
         self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
     }
 
-    pub fn merged(&self) -> bool {
-        self.flags
-            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
-    }
-
     pub fn added(&self) -> bool {
         self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
     }
diff -r 8f88307f8e07 -r c29d312657d2 rust/hg-cpython/src/dirstate/item.rs
--- a/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 03:29:33 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 03:30:00 2021 +0200
@@ -83,11 +83,6 @@
     }
 
     @property
-    def merged(&self) -> PyResult<bool> {
-        Ok(self.entry(py).get().merged())
-    }
-
-    @property
     def removed(&self) -> PyResult<bool> {
         Ok(self.entry(py).get().removed())
     }