mercurial/dirstatemap.py

47902:4cade5e944c2

                return
            else:
                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
        elif (p1_tracked or p2_tracked) and not wc_tracked:
            pass
        elif clean_p2 and wc_tracked:
            if p1_tracked or self.get(filename) is not None:
                # XXX the `self.get` call is catching some case in

47903:6816ae362ddd

                return
            else:
                self.addfile(filename, from_p2=True)
                return
        elif not (p1_tracked or p2_tracked) and wc_tracked:
            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:
            if p1_tracked or self.get(filename) is not None:
                # XXX the `self.get` call is catching some case in