1 files changed, 11 insertions, 0 deletions
diff --git a/lib/rubygems/dependency_resolver/dependency_conflict.rb b/lib/rubygems/dependency_resolver/dependency_conflict.rb
index 1755d910c3..092f000cdb 100644
--- a/lib/rubygems/dependency_resolver/dependency_conflict.rb
+++ b/lib/rubygems/dependency_resolver/dependency_conflict.rb
@@ -8,12 +8,21 @@ class Gem::DependencyResolver::DependencyConflict
 
   attr_reader :dependency
 
+  attr_reader :failed_dep # :nodoc:
+
   def initialize(dependency, activated, failed_dep=dependency)
     @dependency = dependency
     @activated = activated
     @failed_dep = failed_dep
   end
 
+  def == other
+    self.class === other and
+      @dependency == other.dependency and
+      @activated  == other.activated  and
+      @failed_dep == other.failed_dep
+  end
+
   ##
   # Return the 2 dependency objects that conflicted
 
@@ -71,6 +80,8 @@ class Gem::DependencyResolver::DependencyConflict
       current = current.request.requester
     end
 
+    path = ['user request (gem command or Gemfile)'] if path.empty?
+
     path
   end