solving conflicts correctly

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
index 47b4bac..649058a 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution
@@ -6,10 +6,10 @@
 >!> A conflict over [package] (namedcap) B == 1.0-1 ([package] (namedcap) B) requires the removal of to-be-installed B-1.0-1[test]
 >!>    Solution:
 >!>       Deleting B
->!>       Deleting U___[package]B-1.0-1.
+>!>       Deleting U_Tl_[package]B-1.0-1.
 >!>    Solution:
 >!>       Deleting A
->!>       Deleting U___[package]A-1.0-1.
+>!>       Deleting U_Tl_[package]A-1.0-1.
 >!>    Solution:
 >!>       Ignoring conflict of B
 >!>       

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
index 47c2a8c..8011506 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution
@@ -5,7 +5,7 @@
 >!> A conflict over [package] (namedcap) B == 1.0-1 ([package] (namedcap) B) requires the removal of to-be-installed B-1.0-1[test]
 >!>    Solution:
 >!>       Deleting B
->!>       Deleting U___[package]B-1.0-1.
+>!>       Deleting U_Tl_[package]B-1.0-1.
 >!>    Solution:
 >!>       Deleting A
 >!>       Deleting I___[package]A-1.0-1.

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution
new file mode 100644 (file)
index 0000000..47fa293
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution
@@ -0,0 +1,7 @@
+>!> Installing B from channel test
+>!> Uninstalling A
+>!> No problems so far
+>!> Solution #1:
+>!> install B-1.0-1[test]
+>!> remove  A-1.0-1
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution
index cc51c7e..5ed6541 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution
+++ b/testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution
@@ -5,7 +5,7 @@
 >!> There are no installable providers of [package] (namedcap) nothere for unfulfilled-1.0-1[test]
 >!>    Solution:
 >!>       Deleting unfulfilled
->!>       Deleting U___[package]unfulfilled-1.0-1.
+>!>       Deleting U_Tl_[package]unfulfilled-1.0-1.
 >!>    Solution:
 >!>       Ignoring this requirement
 >!>