ref: refs/heads/SuSE-SLE-10-SP3-Branch commit e6fc5cccb1022cc5627edf63a71076027b3bac4b Author: Stefan Schubert Date: Wed Oct 15 09:56:34 2008 +0000 adapted to cruisecontrol --- .../basic-exercises/maxSolution-test.solution | 13 ++++++++++--- .../basic-exercises/require-1-test.solution | 4 ++-- .../basic-exercises/require-2-test.solution | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/maxSolution-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/maxSolution-test.solution index a253445..6c849b6 100644 --- a/testsuite/solver/data.deptestomatic/basic-exercises/maxSolution-test.solution +++ b/testsuite/solver/data.deptestomatic/basic-exercises/maxSolution-test.solution @@ -2,15 +2,22 @@

!> Installing Z from channel test !> Solution #1: !> install A-1.0-1.noarch[test] +>!> install F-1.0-1.noarch[test] +>!> install Z-1.0-1.noarch[test] +>!> |unflag C-1.0-1.noarch[test] +>!> |unflag H-1.0-1.noarch[test] +>!> installs=3, upgrades=0, uninstalls=0 +>!> Solution #2: +>!> install A-1.0-1.noarch[test] !> install G-1.0-1.noarch[test] !> install Z-1.0-1.noarch[test] !> |unflag B-1.0-1.noarch[test] !> |unflag H-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 ->!> Solution #2: +>!> Solution #3: !> install A-1.0-1.noarch[test] ->!> install F-1.0-1.noarch[test] +>!> install E-1.0-1.noarch[test] !> install Z-1.0-1.noarch[test] ->!> |unflag C-1.0-1.noarch[test] +>!> |unflag D-1.0-1.noarch[test] !> |unflag H-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/require-1-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/require-1-test.solution index 7c9ed79..594d7ba 100644 --- a/testsuite/solver/data.deptestomatic/basic-exercises/require-1-test.solution +++ b/testsuite/solver/data.deptestomatic/basic-exercises/require-1-test.solution @@ -1,12 +1,12 @@ !> Solution #1: !> install A-2.0-1.noarch[test] !> install B-1.0-1.noarch[test] ->!> install C-1.0-1.noarch[test] +>!> install D-1.0-1.noarch[test] !> |unflag E-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 !> Solution #2: !> install A-2.0-1.noarch[test] !> install B-1.0-1.noarch[test] ->!> install D-1.0-1.noarch[test] +>!> install C-1.0-1.noarch[test] !> |unflag E-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/require-2-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/require-2-test.solution index 7c9ed79..594d7ba 100644 --- a/testsuite/solver/data.deptestomatic/basic-exercises/require-2-test.solution +++ b/testsuite/solver/data.deptestomatic/basic-exercises/require-2-test.solution @@ -1,12 +1,12 @@ !> Solution #1: !> install A-2.0-1.noarch[test] !> install B-1.0-1.noarch[test] ->!> install C-1.0-1.noarch[test] +>!> install D-1.0-1.noarch[test] !> |unflag E-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 !> Solution #2: !> install A-2.0-1.noarch[test] !> install B-1.0-1.noarch[test] ->!> install D-1.0-1.noarch[test] +>!> install C-1.0-1.noarch[test] !> |unflag E-1.0-1.noarch[test] !> installs=3, upgrades=0, uninstalls=0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org