Mark Juggurnauth-Thomas f8190ccadd bookmarks_movement: allow commits to land if there are pre-existing case conflicts ... Summary: The old case-conflict checks were more lenient, and only triggered if a commit introduced a case conflict compared to its first parent. This means that commits could still be landed to bookmarks that already had pre-existing case conflicts. Relax the new case-conflict checks to allow this same scenario. Note that we're still a bit more strict: the previous checks ignored other parents, and would not reject a commit if the act of merging introduces a case conflict. The new case conflict checks only permit case conflicts in the case where all conflicting files were present in one of the parents. Reviewed By: StanislavGlebik Differential Revision: D25508845 fbshipit-source-id: 95f4db1300ee73b8e6495ba8b5c1c2ce5a957d1a		2020-12-15 01:53:39 -08:00
..
fs	doctor: handle invalid contents of .buckd/pid	2020-12-14 23:18:21 -08:00
integration	fix redirect list test on Windows	2020-12-08 15:54:48 -08:00
locale	add a copyright header to glibc_en.po	2019-04-26 14:38:27 -07:00
mononoke	bookmarks_movement: allow commits to land if there are pre-existing case conflicts	2020-12-15 01:53:39 -08:00
scm	streams: restore commit text prefetching behavior	2020-12-14 19:10:44 -08:00
test_support	Manually upgrading eden, and fixing their config	2020-08-06 12:37:04 -07:00
test-data	enable treemanifest in snapshots	2019-08-28 18:46:03 -07:00
.gitignore	eden: wire up mac contbuild	2019-02-05 21:52:30 -08:00
Eden.project.toml	Eden.project.toml file for Nuclide	2018-04-26 11:05:23 -07:00