diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -298,8 +298,7 @@ self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) return elif possibly_dirty: - self.addfile(filename, possibly_dirty=possibly_dirty) - return + pass elif wc_tracked: # this is a "normal" file if parentfiledata is None: