Mercurial > hg-stable
changeset 47934:6816ae362ddd
dirstatemap: use the default code to handle "added" case
This one is very easy too.
Differential Revision: https://phab.mercurial-scm.org/D11328
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 17:29:16 +0200 |
| parents | 4cade5e944c2 |
| children | 822c67420c77 |
| 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:23:40 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Jul 16 17:29:16 2021 +0200 @@ -271,8 +271,7 @@ self.addfile(filename, from_p2=True) return elif not (p1_tracked or p2_tracked) and wc_tracked: - self.addfile(filename, added=True, possibly_dirty=possibly_dirty) - return + pass # file is added, nothing special to adjust elif (p1_tracked or p2_tracked) and not wc_tracked: pass elif clean_p2 and wc_tracked: