[pacman-dev] [patch] resolveconflict clean-up

[Nagy Gabor]

Hi!
If you want to apply this patch, please follow my patch flow ;-)
I think my alpm_sync_prepare is much cleaner than the old one.
As you see, sync040.py and sync041.py now fails, because patched pacman 
autoresolves target vs target conflict now (I marked this as TODO: user 
should be asked to 'remove pkg1' or 'remove pkg2' or don't resolve this 
conflict.)
Bye, ngaba
Ps: Both the old and patched version of sync_prepare have a problem:
If conflict resolution induces a replace, we can loose the 
PM_SYNC_TYPE_DEPEND information!!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolveconflict.diff
Type: text/x-diff
Size: 11276 bytes
Desc: 
URL: <http://archlinux.org/pipermail/pacman-dev/attachments/20070805/48a7cdf0/attachment.bin>