Merge pull request #1217 from ericmj/mix-outofdatedepserror

Improve error message for diverged deps

Author: José Valim

lib/mix/lib/mix/exceptions.ex

@@ -17,6 +17,7 @@ defexception Mix.Error, mix_error: true, message: nil
 
 defexception Mix.OutOfDateDepsError, mix_error: true, env: nil do
   def message(exception) do
-    "Some dependencies are out of date, please run `MIX_ENV=#{exception.env} mix deps.get` to proceed"
+    "Some dependencies are out of date, please run `MIX_ENV=#{exception.env} mix deps.get` to proceed, " <>
+    "or solve any diverged dependencies, run `MIX_ENV=#{exception.env} mix deps` for more information"
   end
 end

lib/mix/test/mix/tasks/deps_test.exs

@@ -106,7 +106,7 @@ defmodule Mix.Tasks.DepsTest do
     Mix.Project.push OutOfDateDepsApp
 
     in_fixture "deps_status", fn ->
-      assert_raise Mix.OutOfDateDepsError, "Some dependencies are out of date, please run `MIX_ENV=dev mix deps.get` to proceed", fn ->
+      assert_raise Mix.OutOfDateDepsError, fn ->
         Mix.Tasks.Deps.Check.run []
       end