# HG changeset patch # User Pierre-Yves David # Date 2021-07-16 15:29:16 # Node ID 6816ae362ddda5e599066440d6ed6c4d57a0bc2d # Parent 4cade5e944c2d932f3fa24cd0a9fc8e9e68487e1 dirstatemap: use the default code to handle "added" case This one is very easy too. Differential Revision: https://phab.mercurial-scm.org/D11328 diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -271,8 +271,7 @@ class dirstatemap(object): 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: