Mercurial > hg
view tests/blacklists/linux-vfat @ 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 | 352abbb0be88 |
children |
line wrap: on
line source
# invalid filenames test-add.t test-init.t test-clone.t test-contrib.t test-hgweb-raw.t test-walk.t # no sockets or fifos test-hup.t # no hardlinks test-hardlinks.t test-relink.t # exec bit problems test-convert-bzr-114.t test-convert-bzr-directories.t test-convert-bzr-merges.t test-convert-bzr-treeroot.t test-convert-darcs.t test-merge-tools.t # debugstate exec bit false positives test-dirstate.t test-filebranch.t test-merge-remove.t