summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
Commit message (Expand)AuthorAge
* conflict: include owner for filesystem conflictsAndrew Gregory2017-04-16
* add --overwrite option to ignore file conflictsAndrew Gregory2017-04-12
* find_fileconflicts: rename tmpfiles -> newfilesAndrew Gregory2017-01-04
* conflict: skip dir children when replacing a fileAndrew Gregory2017-01-04
* Update copyright yearsAllan McRae2017-01-04
* Update copyright years for 2016Allan McRae2016-01-04
* skip conflicts resolved by file replacementAndrew Gregory2015-12-05
* Alpm, check for NULL in free-functionsRikard Falkeborn2015-10-27
* Update copyright notices for 2015Allan McRae2015-02-01
* Initialize memory to prevent issues when freeing on errorAllan McRae2014-12-27
* conflict_new: free memory on errorAllan McRae2014-12-24
* add_fileconflict: free memory on errorAllan McRae2014-12-24
* _alpm_conflict_dup: fix memory leak on errorAllan McRae2014-12-24
* fix improper FREELIST callsAndrew Gregory2014-09-16
* move _alpm_lstat into util-commonAndrew Gregory2014-08-03
* alpm: export *_free functionsAndrew Gregory2014-02-04
* Remove ts and sw from vim modeline when noet is setFlorian Pritz2014-01-28
* Update copyright years for 2014Allan McRae2014-01-06
* 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