summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
Commit message (Expand)AuthorAge
* conflict.c: fix directory ownership checkAndrew Gregory2013-08-21
* improve dir->file transition conflict resolutionAndrew Gregory2013-06-03
* conflict.c: check for file -> dir replacementsAndrew Gregory2013-06-03
* conflict.c: exclude trailing slash from file pathAndrew Gregory2013-06-03
* conflict.c: do not ignore symlink<->dir conflictsAndrew Gregory2013-06-03
* alpm_filelist: remove resolved_pathAndrew Gregory2013-06-03
* conflict.c: compare package pointers directlyAndrew Gregory2013-05-05
* Perform limited conflict checking with --forceAllan McRae2013-02-24
* use resolved_path for filelist_containsAndrew Gregory2013-02-24
* return resolved paths from filelist_differenceAndrew Gregory2013-02-24
* return resolved paths from filelist_intersectionAndrew Gregory2013-02-24
* use alpm_list_free on filelist intersectionAndrew Gregory2013-02-24
* find_fileconflicts: reduce path resolution callsAndrew Gregory2013-02-16
* add doxygen comments to conflict.cAndrew Gregory2013-01-28
* Fix open braces styleGerardo Exequiel Pozzi2013-01-04
* Update copyright year for 2013Allan McRae2013-01-03
* Avoid upgrade conflict with unchanged effective pathAllan McRae2012-12-14
* Resolve file paths during inter-package conflict checkAllan McRae2012-12-14
* Split _alpm_filelist_operation functionAllan McRae2012-08-02
* Move filelist functions into separate source fileDan McGee2012-08-02
* Merge branch 'maint'Dan McGee2012-08-01
|\
| * Add more debug logging to dir_belongsto_pkg() functionDan McGee2012-08-01
* | lib/conflict: use a binary search within filelistsDave Reisner2012-08-01
* | Merge branch 'maint'Dan McGee2012-07-10
|\|
| * Check empty subdirectory ownershipAllan McRae2012-07-10
| * Add conflict for replacing owned empty directoryAllan McRae2012-07-10
* | fix -Wshadow warnings as reported by gcc 4.4.3Dave Reisner2012-05-20
* | Move short-lived realpath buffers to the stackDan McGee2012-04-29
* | Update copyright yearsAllan McRae2012-02-20
* | include config.h via MakefilesDave Reisner2011-12-21
* | Calculate root length only once when checking for file conflictsDan McGee2011-12-12
* | lib/conflict: save strlen call by reusing snprintf returnDave Reisner2011-12-12
* | Merge branch 'maint'Dan McGee2011-11-01
|\|
| * Fix issues with replacing unowned symlinksDan McGee2011-10-26
* | Make _alpm_filelist_contains() NULL-safeDan McGee2011-10-14
|/
* Ensure fileconflict value is actually a stringDan McGee2011-09-26
* Former transaction callback rename refactorDan McGee2011-09-02
* Move all callbacks up to the handle levelDan McGee2011-09-02
* Remove outdated comment for _alpm_outerconflictsAllan McRae2011-08-30
* Remove use of no-op accessor functions in libraryDan McGee2011-08-18
* Parse conflicts/provides/replaces at database load timeDan McGee2011-08-15
* Conflict comparison performance enhancementsDan McGee2011-08-09
* Convert package filelists to an array instead of linked listDan McGee2011-07-21
* Allow fileconflict if unowned file moving into backup arrayDan McGee2011-07-14
* Merge remote-tracking branch 'allan/ALPM'Dan McGee2011-07-03
|\
| * Prefix _alpm_errno_t members with ALPMAllan McRae2011-07-02
| * Prefix alpm_transprog_t members with ALPMAllan McRae2011-07-02
| * Prefix alpm_loglevel_t members with ALPMAllan McRae2011-07-02
| * Prefix alpm_fileconflicttype_t members with ALPMAllan McRae2011-07-02
* | conflict code tweaks and cleanupsDan McGee2011-07-03