mercurial/dirstate.py

48015:625b84c1abdd

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:
            self._normallookup(f)
        for f in to_drop:
            if self._map.dropfile(f):
                self._updatedfiles.add(f)

        self._dirty = True

48016:14fa2e583422

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:

            if self.in_merge:
                self.set_tracked(f)
            else:
                self._map.reset_state(
                    f,
                    wc_tracked=True,
                    p1_tracked=True,
                    possibly_dirty=True,
                )
            self._updatedfiles.add(f)
        for f in to_drop:
            if self._map.dropfile(f):
                self._updatedfiles.add(f)

        self._dirty = True