Mercurial > hg
diff mercurial/dirstatemap.py @ 47686:e43128ee436f
dirstate-item: introduce a `dm_otherparent` property
See inline documentation for details.
Differential Revision: https://phab.mercurial-scm.org/D11124
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 14 Jul 2021 22:06:13 +0200 |
| parents | 265cdfaad372 |
| children | e59bd6723f2f |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Wed Jul 14 21:59:18 2021 +0200 +++ b/mercurial/dirstatemap.py Wed Jul 14 22:06:13 2021 +0200 @@ -199,7 +199,7 @@ e = self._map[f] = DirstateItem(state, mode, size, mtime) if e.dm_nonnormal: self.nonnormalset.add(f) - if size == FROM_P2: + if e.dm_otherparent: self.otherparentset.add(f) def removefile(self, f, in_merge=False):