Mercurial > hg
changeset 47900:40cf4b278f8f
dirstatemap: use the default code to handle "p2-tracked" case
We juste have to do minor value adjustement and the default code will do the rest.
This kind of change highglight that "clean_p2" is probably not the right name,
for that value. However this is all thing to be figured out and cleaned up once
are done moving logic at lower level.
Differential Revision: https://phab.mercurial-scm.org/D11325
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 17:14:56 +0200 |
| parents | 625b6ddb828c |
| children | 3429f48d486d |
| files | mercurial/dirstatemap.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Fri Jul 16 17:10:52 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Jul 16 17:14:56 2021 +0200 @@ -295,8 +295,7 @@ self.addfile(filename, from_p2=True) return elif not p1_tracked and p2_tracked and wc_tracked: - self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) - return + clean_p2 = True elif possibly_dirty: pass elif wc_tracked: