Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
AgeCommit message (Collapse)Author
2006-10-16Copyright changesAaron Griffin
2006-10-15Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>Aaron Griffin
for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there
2006-10-15Applied changes from frugalware:Aaron Griffin
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz
2006-10-15Merged frugalware changes (too many to list). Also added some config fileAaron Griffin
handling changes (support [sections] to carry over to included files - this helps with backwards compatibility with existing pacman config files)
2006-05-15first stage of i18n stuff from VMiklosJudd Vinet
2006-03-07removed db_scan calls - take 2Aurelien Foret
2006-03-07removed db_scan callsAurelien Foret
2006-03-04added more debug logsAurelien Foret
2006-03-02code cleanupAurelien Foret
2006-02-21conflict checks: when doing db-vs-target checks, opt to use the NEWER, ↵Judd Vinet
to-be-installed package instead of the local db version if there's one available
2006-02-17prepend library function names with _alpm (helped with the patch from ↵Aurelien Foret
VMiklos <vmiklos@frugalware.org>) added log and event callbacks to sync_commit internal transactions
2006-02-05added a pmconflict_t structure to handle file conflictsAurelien Foret
2006-02-01fixed typos in 2 debug logsAurelien Foret
2006-01-18more code cleanup yetAurelien Foret
2006-01-17fixed detection for duplicate entries in list of deps/conflictsAurelien Foret
2006-01-17reworked log messagesAurelien Foret
2006-01-17- code cleanupAurelien Foret
- log improvements
2006-01-15pulled out conflict checkings from checkdeps() in its own function: ↵Aurelien Foret
checkconflicts()
2006-01-02patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSIONJudd Vinet
2006-01-02fixed a possible memory corruptionAurelien Foret
2005-10-07Merging in recent fixes/additions from 2.9.7Judd Vinet
2005-10-06Added a CYGWIN define to include header files required to build in a Cygwin ↵Aurelien Foret
environment
2005-04-24fixed a commented MLK in db_find_conflicts()/CHECK1Aurelien Foret
2005-03-22moved db_find_conflicts from db.c to conflict.cAurelien Foret