Roll forward of bazelbuild@7bd0ab6: Default --incompatible_strict_con…

…flict_checks to true.

NEW: The flag has been moved from AnalysisOptions to CoreOptions.

The invalidation behavior for the flag was fixed in bazelbuild@cb8db3b. The incompatible flags pipeline reports no broken downstream projects. I've manually validated downstream projects that are already failing without the incompatible flags.

*** Original change description ***

Automated rollback of commit 7bd0ab6.

*** Reason for rollback ***

Breaks rules_apple. The incompatible flags pipeline incorrectly reported the change as safe because setting the flag doesn't invalidate the build (so we got cached results from building without the flag).

*** Original change description ***

Default --incompatible_strict_conflict_checks to true.

The downstream pipeline indicates that this is safe to flip: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/1346

Fixes bazelbuild#16729.

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

PiperOrigin-RevId: 513484241
Change-Id: If407ff1164571492021a1c23168f6dfc66bc01d1

src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java

@@ -176,7 +176,7 @@ public class CoreOptions extends FragmentOptions implements Cloneable {
   @Option(
       name = "incompatible_strict_conflict_checks",
       oldName = "experimental_strict_conflict_checks",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE,
       effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},

src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java

@@ -321,6 +321,8 @@ public void symlinkToDirectory() throws Exception {
 
   @Test
   public void symlinkToNestedFile() throws Exception {
+    addOptions("--noincompatible_strict_conflict_checks");
+
     write(
         "a/defs.bzl",
         "def _impl(ctx):",
@@ -373,6 +375,8 @@ public void symlinkToNestedFile() throws Exception {
 
   @Test
   public void symlinkToNestedDirectory() throws Exception {
+    addOptions("--noincompatible_strict_conflict_checks");
+
     write(
         "a/defs.bzl",
         "def _impl(ctx):",