From a3fca052ca21ad222ac7f2fdd7f3fe84b44beb60 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 25 Oct 2025 21:31:34 +0200 Subject: solver3: Allow removing manually installed packages --- ...st-ubuntu-bug-2111792-intersecting-dependencies | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'test/integration/test-ubuntu-bug-2111792-intersecting-dependencies') diff --git a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies index b63991aa4..4d32c0130 100755 --- a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies +++ b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies @@ -130,19 +130,16 @@ The following information may help to resolve the situation: The following packages have unmet dependencies: git-ng : Depends: git (> 1:2.26.2) E: Unable to satisfy dependencies. Reached two conflicting decisions: - 1. git:amd64=1:2.26.2-1 is selected as an upgrade because: - 1. git-ng:amd64=1:2.26.2-1 is selected for install - 2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.) - [selected git-ng:amd64] - For context, additional choices that could not be installed: - * In git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.): - - git:i386=1:2.26.2-1 is not selected for install because: - 1. git:amd64 is selected for install - 2. git:amd64 Conflicts git:i386 - 2. git:amd64=1:2.26.2-1 is not selected for install because: - 1. git-cvs:amd64=1:2.25.1-1 is selected for install - 2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.) - 3. git:amd64=1:2.25.1-1 conflicts with other versions of itself' apt install git-ng -s + 1. git-ng:amd64=1:2.26.2-1 is selected for install + 2. git-ng:amd64 Depends git (> 1:2.26.2) and Depends git (< 1:2.26.2-.) + but none of the choices are installable: + - git:amd64=1:2.26.2-1 is not selected for install because: + 1. git-cvs:amd64=1:2.25.1-1 is selected for install + 2. git-cvs:amd64=1:2.25.1-1 Depends git (> 1:2.25.1) and Depends git (< 1:2.25.1-.) + 3. git:amd64=1:2.25.1-1 conflicts with other versions of itself + - git:i386=1:2.26.2-1 is not selected for install because: + 1-2. git:amd64=1:2.25.1-1 is selected for install as above + 3. git:amd64 Conflicts git:i386' apt install git-ng -s msgmsg 'Now mix it up by' 'holding both' -- cgit v1.2.3-70-g09d2