Mercurial > hg
diff tests/test-diff-binary-file.t @ 23483:3805f4b0f5a9
largefiles: remove redundant checks for false modify/delete conflicts
In a34a99181f36 (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, 902554884335 (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().
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 05 Dec 2014 10:53:25 -0800 |
parents | 3fbef7ac26f0 |
children | 0db6810e84e8 |