Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.c
AgeCommit message (Expand)Author
2017-04-12add --overwrite option to ignore file conflictsAndrew Gregory
2017-01-04find_fileconflicts: rename tmpfiles -> newfilesAndrew Gregory
2017-01-04conflict: skip dir children when replacing a fileAndrew Gregory
2017-01-04Update copyright yearsAllan McRae
2016-01-04Update copyright years for 2016Allan McRae
2015-12-05skip conflicts resolved by file replacementAndrew Gregory
2015-10-27Alpm, check for NULL in free-functionsRikard Falkeborn
2015-02-01Update copyright notices for 2015Allan McRae
2014-12-27Initialize memory to prevent issues when freeing on errorAllan McRae
2014-12-24conflict_new: free memory on errorAllan McRae
2014-12-24add_fileconflict: free memory on errorAllan McRae
2014-12-24_alpm_conflict_dup: fix memory leak on errorAllan McRae
2014-09-16fix improper FREELIST callsAndrew Gregory
2014-08-03move _alpm_lstat into util-commonAndrew Gregory
2014-02-04alpm: export *_free functionsAndrew Gregory
2014-01-28Remove ts and sw from vim modeline when noet is setFlorian Pritz
2014-01-06Update copyright years for 2014Allan McRae
2013-08-21conflict.c: fix directory ownership checkAndrew Gregory
2013-06-03improve dir->file transition conflict resolutionAndrew Gregory
2013-06-03conflict.c: check for file -> dir replacementsAndrew Gregory
2013-06-03conflict.c: exclude trailing slash from file pathAndrew Gregory
2013-06-03conflict.c: do not ignore symlink<->dir conflictsAndrew Gregory
2013-06-03alpm_filelist: remove resolved_pathAndrew Gregory
2013-05-05conflict.c: compare package pointers directlyAndrew Gregory
2013-02-24Perform limited conflict checking with --forceAllan McRae
2013-02-24use resolved_path for filelist_containsAndrew Gregory
2013-02-24return resolved paths from filelist_differenceAndrew Gregory
2013-02-24return resolved paths from filelist_intersectionAndrew Gregory
2013-02-24use alpm_list_free on filelist intersectionAndrew Gregory
2013-02-16find_fileconflicts: reduce path resolution callsAndrew Gregory
2013-01-28add doxygen comments to conflict.cAndrew Gregory
2013-01-04Fix open braces styleGerardo Exequiel Pozzi
2013-01-03Update copyright year for 2013Allan McRae
2012-12-14Avoid upgrade conflict with unchanged effective pathAllan McRae
2012-12-14Resolve file paths during inter-package conflict checkAllan McRae
2012-08-02Split _alpm_filelist_operation functionAllan McRae
2012-08-02Move filelist functions into separate source fileDan McGee
2012-08-01Merge branch 'maint'Dan McGee
2012-08-01lib/conflict: use a binary search within filelistsDave Reisner
2012-08-01Add more debug logging to dir_belongsto_pkg() functionDan McGee
2012-07-10Merge branch 'maint'Dan McGee
2012-07-10Check empty subdirectory ownershipAllan McRae
2012-07-10Add conflict for replacing owned empty directoryAllan McRae
2012-05-20fix -Wshadow warnings as reported by gcc 4.4.3Dave Reisner
2012-04-29Move short-lived realpath buffers to the stackDan McGee
2012-02-20Update copyright yearsAllan McRae
2011-12-21include config.h via MakefilesDave Reisner
2011-12-12Calculate root length only once when checking for file conflictsDan McGee
2011-12-12lib/conflict: save strlen call by reusing snprintf returnDave Reisner
2011-11-01Merge branch 'maint'Dan McGee