Skip to content

Commit

Permalink
[6.0.0] Default --incompatible_strict_conflict_checks to true. (#16864)
Browse files Browse the repository at this point in the history
The downstream pipeline indicates that this is safe to flip: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/1346

Fixes #16729.

RELNOTES[INC]: `--incompatible_strict_conflict_checks` is flipped to true. See #16729 for details.

PiperOrigin-RevId: 491324038
Change-Id: Iea8951867fa20f2aa1a67bf3ba3c86c26e4292de
  • Loading branch information
tjgq authored Nov 28, 2022
1 parent 29669e6 commit fe16965
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ public class AnalysisOptions extends OptionsBase {
public boolean skyframePrepareAnalysis;

@Option(
name = "experimental_strict_conflict_checks",
defaultValue = "false",
name = "incompatible_strict_conflict_checks",
oldName = "experimental_strict_conflict_checks",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE,
effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ public void symlinkToDirectory() throws Exception {

@Test
public void symlinkToNestedFile() throws Exception {
addOptions("--noincompatible_strict_conflict_checks");

write(
"a/defs.bzl",
"def _impl(ctx):",
Expand Down Expand Up @@ -364,6 +366,8 @@ public void symlinkToNestedFile() throws Exception {

@Test
public void symlinkToNestedDirectory() throws Exception {
addOptions("--noincompatible_strict_conflict_checks");

write(
"a/defs.bzl",
"def _impl(ctx):",
Expand Down

0 comments on commit fe16965

Please sign in to comment.