summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-07-26 19:06:18 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-07-26 19:06:18 -0700
commite9b9c0f2bebf6b6be8be2586016cef4146891aa2 (patch)
tree2d4fb0415f369b0ac2cb7cd24afffc168b6bf157
parent35286b96a9de591119c2b8b8da4ad5595755d7e4 (diff)
downloadbundler-e9b9c0f2bebf6b6be8be2586016cef4146891aa2.tar.gz
[Resolver] Explain what each failed bit in a conflict tree resolved to
-rw-r--r--lib/bundler/resolver.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 3d21bf67bb..67e18c8616 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -17,6 +17,9 @@ module Bundler
depth = 2
tree.each do |req|
t << " " * depth << req.to_s
+ if spec = conflict.activated_by_name[req.name]
+ t << %(, resolved to #{spec.version},)
+ end
t << %( depends on) unless tree.last == req
t << %(\n)
depth += 1