hgext/largefiles/overrides.py

22096:61e526585b20

        result = orig(ui, repo, **opts)
        merge.update(repo, node=None, branchmerge=False, force=True,
                     partial=lfutil.isstandin)

        lfdirstate = lfutil.openlfdirstate(ui, repo)
        lfiles = lfutil.listlfiles(repo)
        for file in lfiles:
            lfutil.synclfdirstate(repo, lfdirstate, file, True)
        lfdirstate.write()
    finally:
        wlock.release()
    return result

22097:7d1eac06ab2b

        result = orig(ui, repo, **opts)
        merge.update(repo, node=None, branchmerge=False, force=True,
                     partial=lfutil.isstandin)

        lfdirstate = lfutil.openlfdirstate(ui, repo)
        orphans = set(lfdirstate)
        lfiles = lfutil.listlfiles(repo)
        for file in lfiles:
            lfutil.synclfdirstate(repo, lfdirstate, file, True)
            orphans.discard(file)
        for lfile in orphans:
            lfdirstate.drop(lfile)
        lfdirstate.write()
    finally:
        wlock.release()
    return result