mercurial/localrepo.py

45064:41b32cbc53f8

                ):
                    fparent1, fparent2 = fparent2, nullid

        # is the file changed?
        text = fctx.data()
        if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
            changelist.append(fname)
            return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
        # are just the flags changed during merge?
        elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
            changelist.append(fname)

45065:b8f4ead9fa49

                ):
                    fparent1, fparent2 = fparent2, nullid

        # is the file changed?
        text = fctx.data()
        if fparent2 != nullid or meta or flog.cmp(fparent1, text):
            changelist.append(fname)
            return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
        # are just the flags changed during merge?
        elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
            changelist.append(fname)