Revert revision ignoring in satisfy(constraint, constraint)

1 files changed, 6 insertions, 5 deletions

diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx
index 1dbf94b..e17ac01 100644
--- a/bpkg/pkg-configure.cxx
+++ b/bpkg/pkg-configure.cxx
@@ -70,8 +70,9 @@ namespace bpkg
 
             auto r (p->prerequisites.emplace (dp, d.constraint));
 
-            // If we already have a dependency on this package, pick the
-            // stricter of the two constraints.
+            // Currently we can only capture a single constraint, so if we
+            // already have a dependency on this package and one constraint is
+            // not a subset of the other, complain.
             //
             if (!r.second)
             {
@@ -81,9 +82,9 @@ namespace bpkg
               bool s2 (satisfies (d.constraint, c));
 
               if (!s1 && !s2)
-                fail << "incompatible constraints "
-                     << "(" << n << " " << *c << ") and "
-                     << "(" << n << " " << *d.constraint << ")";
+                fail << "multiple dependencies on package " << n <<
+                  info << n << " " << *c <<
+                  info << n << " " << *d.constraint;
 
               if (s2 && !s1)
                 c = d.constraint;