mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
cdeb1e3671
In c69fe5519c86 (largefiles: don't show largefile/normal prompts if one side is unchanged, 2014-12-01), overridecalculateupdates() started checking for false modify/delete conflicts in large files and their standins. Then, in the very next changeset, 99b29d2bd5ed (merge: before cd/dc prompt, check that changed side really changed, 2014-12-01), calculateupdates() itself started checking for false modify/delete conflicts in all files. Since "large files and their standins" is a subset of "all files", we can now drop the checks in overridecalculateupdates(). |
||
---|---|---|
.. | ||
__init__.py | ||
basestore.py | ||
CONTRIBUTORS | ||
lfcommands.py | ||
lfutil.py | ||
localstore.py | ||
overrides.py | ||
proto.py | ||
remotestore.py | ||
reposetup.py | ||
uisetup.py | ||
wirestore.py |