Merge pull request #1530 from Stift/ImproveWarningMessageOnConflicts

Improve warning text on conflict
fsprojects · Mar 19, 2016 · bfe9aa9 · bfe9aa9
2 parents 816493a + fe03c28
commit bfe9aa9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -126,9 +126,9 @@ type Resolution =
 
                         match x.Parent with
                         | DependenciesFile _ ->
-                            sprintf "   - Dependencies file requested: %s%s" vr pr |> addToError
+                            sprintf "   - Dependencies file requested package %O: %s%s" r.Name vr pr |> addToError
                         | Package(parentName,version,_) ->
-                            sprintf "   - %O %O requested: %s%s" parentName version vr pr |> addToError)
+                            sprintf "   - %O %O requested package %O: %s%s" parentName version r.Name vr pr |> addToError)
 
             match this.GetConflicts() with
             | [] -> addToError <| sprintf "  Could not resolve package %O. Unknown resolution error." (Seq.head stillOpen)