From f607b9a61d9d2b03b377c7e72fb179b5d8a66835 Mon Sep 17 00:00:00 2001
From: Groboclown <matt@groboclown.net>
Date: Fri, 3 Mar 2017 20:41:03 -0600
Subject: [PATCH] Prepare for 0.8.4-beta.2.

---
 CHANGES.md                                                  | 3 +++
 plugin/META-INF/plugin.xml                                  | 6 +++++-
 .../groboclown/idea/p4ic/config/P4ProjectConfigStack.java   | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d90d46b2..31ec8f8a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,9 @@
       thread and into the background.
     * Fixed the reload buttons to be disabled while the process is running.
     * Moved the client name field spinner to be consistent with the rest of the UI.
+    * Changed validation check for the server configuration and the client
+      configuration so it now reports a warning rather than throwing an
+      error (#144).
     * Added validation check to ensure client name is not purely numeric.
     * Temporarily disabled the client name refresh button until that's all worked out.
 
diff --git a/plugin/META-INF/plugin.xml b/plugin/META-INF/plugin.xml
index 5a3ef6cb..6d0dcddf 100644
--- a/plugin/META-INF/plugin.xml
+++ b/plugin/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <name>Perforce IDEA Community Integration</name>
     <id>PerforceIC</id>
-    <version>0.8.4-beta.1</version>
+    <version>0.8.4-beta.2</version>
     <idea-version since-build="IC-135.1286"/>
     <category>VCS Integration</category>
     <change-notes><![CDATA[
@@ -21,7 +21,11 @@
                 thread and into the background.</li>
               <li>Fixed the reload buttons to be disabled while the process is running.</li>
               <li>Moved the client name field spinner to be consistent with the rest of the UI.</li>
+              <li>Changed validation check for the server configuration and the client
+                configuration so it now reports a warning rather than throwing an
+                error.</li>
               <li>Added validation check to ensure client name is not purely numeric.</li>
+              <li>Temporarily disabled the client name refresh button until that's all worked out.</li>
             </ol>
           </li>
           <li><em>0.8.3</em>
diff --git a/plugin/src/net/groboclown/idea/p4ic/config/P4ProjectConfigStack.java b/plugin/src/net/groboclown/idea/p4ic/config/P4ProjectConfigStack.java
index de544358..0a2e779d 100644
--- a/plugin/src/net/groboclown/idea/p4ic/config/P4ProjectConfigStack.java
+++ b/plugin/src/net/groboclown/idea/p4ic/config/P4ProjectConfigStack.java
@@ -375,8 +375,9 @@ private static class ClientServerSetup {
         private ClientServerSetup(@Nullable ServerConfig serverConfig, @NotNull MultipleDataPart dataPart,
                 @NotNull VirtualFile path) {
             if (serverConfig != null && ! serverConfig.isSameServer(dataPart)) {
-                LOG.error("Server config " + serverConfig + " does not match " +
-                        ConfigPropertiesUtil.toProperties(dataPart));
+                LOG.warn("Server config " + serverConfig + " does not match "
+                        + ConfigPropertiesUtil.toProperties(dataPart) + ".  Turn on debugging for category #"
+                        + ServerConfig.class.getName() + " to understand where the mismatch occurred.");
             }
             if (LOG.isDebugEnabled() && serverConfig == null) {
                 LOG.debug("Created ClientServerSetup with null server config for " +