diff options
| author | Julian Andres Klode <jak@debian.org> | 2026-01-31 16:51:50 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2026-01-31 16:51:50 +0000 |
| commit | f2ca127212bcde9921cfc31245dc44d5b3c975eb (patch) | |
| tree | 120116a10a15504e3776591c264aef5c1c31c356 /test/integration/test-ubuntu-bug-2111792-intersecting-dependencies | |
| parent | 0a37f95b2d9582c5cad95725302abaf0635ee8a3 (diff) | |
| parent | 1fbb857b6b2cbddcea9e8b03aa0c766c72e91f34 (diff) | |
Merge branch 'solver3' into 'main'
solver3: Use classical watchers and minor refactorings
See merge request apt-team/apt!548
Diffstat (limited to 'test/integration/test-ubuntu-bug-2111792-intersecting-dependencies')
| -rwxr-xr-x | test/integration/test-ubuntu-bug-2111792-intersecting-dependencies | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies index 7e770a30d..3f100cb1f 100755 --- a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies +++ b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies @@ -97,15 +97,21 @@ 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 assignments: - 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-.) + 1. git:i386=1:2.26.2-1 is selected for install 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:amd64=1:2.26.2-1 is not selected for install because: + 1. git:amd64=1:2.25.1-1 is selected for install + 2. git:amd64=1:2.26.2-1 conflicts with other versions of itself + 2. git:i386=1:2.26.2-1 -> | git:i386 but none of the choices are installable: - - git:amd64=1:2.26.2-1 is not selected for install because: - 1. git:amd64=1:2.25.1-1 is selected for install - 2. 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: + - git:i386 is not selected for install because: 1. git:amd64=1:2.25.1-1 is selected for install as above - 2. git:amd64 Conflicts git:i386' apt install git-ng -s + 2. git:i386 Conflicts git + [selected git:amd64=1:2.25.1-1]' apt install git-ng -s msgmsg 'Now mix it up by' 'holding git-cvs' |