Mercurial > public > mercurial-scm > hg
diff mercurial/dirstate.py @ 47529:d3cf20328abd
dirstate: infer the 'n' state from `from_p2`
This flag is only used with 'n' so lets set the state based on that parameter in
this case.
Differential Revision: https://phab.mercurial-scm.org/D10971
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 04 Jul 2021 01:58:03 +0200 |
| parents | 80617f3c0f9a |
| children | a1745a292885 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Sun Jul 04 01:57:28 2021 +0200 +++ b/mercurial/dirstate.py Sun Jul 04 01:58:03 2021 +0200 @@ -543,7 +543,7 @@ self._addpath(f, merged=True) else: # add-like - self._addpath(f, b'n', 0, from_p2=True) + self._addpath(f, from_p2=True) self._map.copymap.pop(f, None) def add(self, f):