From baeb479aef03257d931ff461b01f02f967a6656c Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Mon, 11 May 2015 11:45:47 -0700
Subject: [PATCH] HADOOP-11951. test-patch should give better info about
 failures to handle dev-support updates without resetrepo option (Sean Busbey
 via aw)

---
 dev-support/test-patch.sh                       | 8 ++++++++
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index a3ce5677c7..11fd9a9719 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -1446,6 +1446,14 @@ function check_reexec
   fi
 
   big_console_header "dev-support patch detected"
+
+  if [[ ${RESETREPO} == false ]]; then
+    ((RESULT = RESULT + 1))
+    hadoop_debug "can't destructively change the working directory. run with '--resetrepo' please. :("
+    add_jira_table -1 dev-support "Couldn't test dev-support changes because we aren't configured to destructively change the working directory."
+    return
+  fi
+
   printf "\n\nRe-executing against patched versions to test.\n\n"
 
   apply_patch_file
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 929ada1271..f237b85fef 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -656,6 +656,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11928. Test-patch check for @author tags incorrectly flags
     removal of @author tags (Kengo Seki via aw)
 
+    HADOOP-11951. test-patch should give better info about failures to handle
+    dev-support updates without resetrepo option (Sean Busbey via aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES