Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstate.py @ 47527:c6b91a9c242a
dirstate: use a `merged` parameter to _addpath
Differential Revision: https://phab.mercurial-scm.org/D10969
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 04 Jul 2021 01:48:11 +0200 |
| parents | 8bcae9bf9e8d |
| children | 80617f3c0f9a |
line wrap: on
line diff
--- a/mercurial/dirstate.py Sun Jul 04 01:44:43 2021 +0200 +++ b/mercurial/dirstate.py Sun Jul 04 01:48:11 2021 +0200 @@ -448,6 +448,7 @@ size=None, mtime=None, added=False, + merged=False, from_p2=False, possibly_dirty=False, ): @@ -476,6 +477,7 @@ size=size, mtime=mtime, added=added, + merged=merged, from_p2=from_p2, possibly_dirty=possibly_dirty, ) @@ -538,7 +540,7 @@ raise error.Abort(msg) if f in self and self[f] == b'n': # merge-like - self._addpath(f, b'm', 0, from_p2=True) + self._addpath(f, merged=True) else: # add-like self._addpath(f, b'n', 0, from_p2=True)