mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
f8190ccadd
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 |
||
|---|---|---|
| .. | ||
| blame | ||
| changeset_info | ||
| deleted_files_manifest | ||
| fastlog | ||
| filenodes | ||
| fsnodes | ||
| mercurial_derived_data | ||
| skeleton_manifest | ||
| src | ||
| test_utils | ||
| unodes | ||
| utils | ||
| Cargo.toml | ||