From 99ca86f7c2968741ac3a9b20c3375fc992d49e66 Mon Sep 17 00:00:00 2001 From: Tiago Quelhas Date: Tue, 29 Nov 2022 16:08:36 +0100 Subject: [PATCH] Revert "[6.0.0] Default --incompatible_strict_conflict_checks to true. (#16864)" (#16872) This reverts commit fe169654a29d8ad33105d5d0034a7857834fed5d. Breaks rules_apple (and possibily other projects). --- .../google/devtools/build/lib/analysis/AnalysisOptions.java | 5 ++--- .../lib/remote/BuildWithoutTheBytesIntegrationTest.java | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java index b8ca3c08405d99..2a7c75b4b4ee73 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java @@ -91,9 +91,8 @@ public class AnalysisOptions extends OptionsBase { public boolean skyframePrepareAnalysis; @Option( - name = "incompatible_strict_conflict_checks", - oldName = "experimental_strict_conflict_checks", - defaultValue = "true", + name = "experimental_strict_conflict_checks", + defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE, effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION}, diff --git a/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java index 920dd8870308f8..70e138cbc34ed3 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java @@ -312,8 +312,6 @@ public void symlinkToDirectory() throws Exception { @Test public void symlinkToNestedFile() throws Exception { - addOptions("--noincompatible_strict_conflict_checks"); - write( "a/defs.bzl", "def _impl(ctx):", @@ -366,8 +364,6 @@ public void symlinkToNestedFile() throws Exception { @Test public void symlinkToNestedDirectory() throws Exception { - addOptions("--noincompatible_strict_conflict_checks"); - write( "a/defs.bzl", "def _impl(ctx):",