Revert "Clean the `backtrack_stack` so we don't backtrack to a place with cashed...

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 4174cc0b4bc44c7a84db66768b930962a82ac1fc..fe9a8c85dad5fee6692f075efd3bb0eb845e7e96 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -1095,18 +1095,6 @@ fn activate_deps_loop(
                             has_past_conflicting_dep = true;
                         }
                     }
-                    if !has_another && has_past_conflicting_dep && !backtracked {
-                        // we have not activated ANY candidates.
-                        // So clean the `backtrack_stack` so we don't
-                        // backtrack to a place where we will try this again.
-                        backtrack_stack.retain(|bframe| {
-                            // Maybe we could just not add them in the first place, but for now this works
-                            !bframe.context_backup.is_conflicting(
-                                Some(parent.package_id()),
-                                &conflicting_activations,
-                            )
-                        });
-                    }
                     // if not has_another we we activate for the better error messages
                     frame.just_for_error_messages = has_past_conflicting_dep;
                     if !has_past_conflicting_dep