Merge pull request #994 from mrinaldi/shows_conflicts_with_requirements

Shows conflicts with requirements
fsprojects · Aug 18, 2015 · d2fefb6 · d2fefb6
2 parents 8c455fa + 4518cd8
commit d2fefb6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -352,6 +352,7 @@ let Resolve(getVersionsF, getPackageDetailsF, globalFrameworkRestrictions, rootD
                         tracefn "  Conflicts with:"
 
                         closedRequirements
+                        |> Set.union requirements
                         |> Seq.filter (fun d -> d.Name = currentRequirement.Name)
                         |> fun xs -> String.Join(Environment.NewLine + "    ",xs)
                         |> tracefn "    %s"