From 7a4110525888fb4405f27bba72e4bc64523adadd Mon Sep 17 00:00:00 2001 From: Tiago Quelhas Date: Fri, 24 Feb 2023 21:35:10 +0100 Subject: [PATCH] [6.1.0] Add an --incompatible_strict_conflict_checks alias for --experimental_strict_conflict_checks. (#17589) I'm about to attempt this flag flip to see what breaks. PiperOrigin-RevId: 487251570 Change-Id: Ia0e95ac4a1e04421cfdcd311c4500feef08c77d0 --- .../google/devtools/build/lib/analysis/AnalysisOptions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2a7c75b4b4ee73..f7cc3967b0b436 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,7 +91,8 @@ public class AnalysisOptions extends OptionsBase { public boolean skyframePrepareAnalysis; @Option( - name = "experimental_strict_conflict_checks", + name = "incompatible_strict_conflict_checks", + oldName = "experimental_strict_conflict_checks", defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE,