summaryrefslogtreecommitdiffstats
path: root/pactest/tests/sync897.py
AgeCommit message (Collapse)AuthorFilesLines
2008-01-24libalpm/sync.c : conflicts resolving cleanup.Chantry Xavier1-3/+3
The original patch from Nagy tried to resolve target vs target conflicts, and so broke the following pactests : sync040, sync041 and sync990 Nagy's proposal to solve this situation was to choose the interactive way, ask the user how to deal with it: either remove pkg1 or remove pkg2 or stop here. So he left this as a TODO. But instead of trying to resolve these conflicts or asking the user, I tried to find a more conservative way, looking at what the current pactests expected: If between the two conflicting packages, one provides the other, pacman will keep that one and remove the other from the target list. That breaks sync893 and sync897. But Dan agreed these two looked weird and should be changed. This commit should close FS#8897, FS#8899 and FS#9024. Reference: http://www.archlinux.org/pipermail/pacman-dev/2007-October/009745.html http://www.archlinux.org/pipermail/pacman-dev/2007-December/010393.html Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2007-02-27* Some new tests. That bring new failures. :)Dan McGee1-4/+1
2007-02-23* Changes to quite a few of the tests, mostly minimal changes (betterDan McGee1-1/+1
descriptions, additional rules, etc) * One new pactest test regarding file migration between packages. * Fix of a little output bug in pmenv.py
2007-02-21* Indentation changes - 4 spaces for python, we standardized this before (andAaron Griffin1-0/+1
it's a PEP) * Modified some sync tests
2006-10-15Added pactest to repository, from Aurelien Foret:Aaron Griffin1-0/+26
http://aurelien.foret.free.fr/archlinux/pactest/