From 43f21a60c09904657103b91e56b6fb2e5f339770 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 4 Sep 2023 13:45:40 +0300 Subject: In postponed_configuration::merge() also save ids of clusters merged into cluster being merged from --- bpkg/pkg-build-collect.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bpkg/pkg-build-collect.hxx') diff --git a/bpkg/pkg-build-collect.hxx b/bpkg/pkg-build-collect.hxx index 1ce6962..8d34162 100644 --- a/bpkg/pkg-build-collect.hxx +++ b/bpkg/pkg-build-collect.hxx @@ -691,7 +691,7 @@ namespace bpkg // finalized or a further refinement is required. In the former case we // report the first encountered unsatisfied dependency constraint and // fail. Otherwise, we drop the cache and proceed with the next iteration of - // the execution plan refinement which may resolve these problem naturally. + // the execution plan refinement which may resolve these problems naturally. // struct unsatisfied_dependent { @@ -774,7 +774,7 @@ namespace bpkg { public: // The id of the cluster plus the ids of all the clusters that have been - // merged into it. + // merged into it directly or as their components. // size_t id; small_vector merged_ids; -- cgit v1.1