Mercurial > hg
diff mercurial/dirstatemap.py @ 47901:3429f48d486d
dirstatemap: use the default code to handle "clean-p2" case
This simplify the conditionnal a bit since most of it is handled by the common
code.
Differential Revision: https://phab.mercurial-scm.org/D11326
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 16 Jul 2021 17:20:17 +0200 |
parents | 40cf4b278f8f |
children | 4cade5e944c2 |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Fri Jul 16 17:14:56 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Jul 16 17:20:17 2021 +0200 @@ -289,11 +289,8 @@ # In addition, this seems to be a case where the file is marked # as merged without actually being the result of a merge # action. So thing are not ideal here. - self.addfile(filename, merged=True) - return - else: - self.addfile(filename, from_p2=True) - return + merged = True + clean_p2 = False elif not p1_tracked and p2_tracked and wc_tracked: clean_p2 = True elif possibly_dirty: