Submitter | phabricator |
---|---|
Date | Aug. 21, 2021, 9:57 a.m. |
Message ID | <differential-rev-PHID-DREV-aecnxozw6a2h7eswe5iw-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49642/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -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: