From 5c28a5199c189b36360823728e190ada137f7810 Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Mon, 22 Aug 2022 10:01:27 -0700
Subject: [PATCH] Improve BWC distribution mismatch error message (#88911)

---
 .../internal/InternalDistributionBwcSetupPlugin.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
index d54eb17976f50..9f558913e7461 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
@@ -24,6 +24,7 @@
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -251,9 +252,10 @@ static void createBuildBwcTask(
                 @Override
                 public void execute(Task task) {
                     if (expectedOutputFile.exists() == false) {
-                        throw new InvalidUserDataException(
-                            "Building " + bwcVersion.get() + " didn't generate expected artifact " + expectedOutputFile
-                        );
+                        Path relativeOutputPath = project.getRootDir().toPath().relativize(expectedOutputFile.toPath());
+                        final String message = "Building %s didn't generate expected artifact [%s]. The working branch may be "
+                            + "out-of-date - try merging in the latest upstream changes to the branch.";
+                        throw new InvalidUserDataException(message.formatted(bwcVersion.get(), relativeOutputPath));
                     }
                 }
             });