mercurial/dirstatemap.py

47513:10e740292dff

            # would be nice.
            if entry is not None:
                # backup the previous state
                if entry.merged:  # merge
                    size = NONNORMAL
                elif entry[0] == b'n' and entry[2] == FROM_P2:  # other parent
                    size = FROM_P2
                    self.otherparentset.add(f)
        if size == 0:
            self.copymap.pop(f, None)

47514:559aee84b889

            # would be nice.
            if entry is not None:
                # backup the previous state
                if entry.merged:  # merge
                    size = NONNORMAL
                elif entry[0] == b'n' and entry.from_p2:
                    size = FROM_P2
                    self.otherparentset.add(f)
        if size == 0:
            self.copymap.pop(f, None)