index
:
makepnd.git
makepnd
makepnd-ng
git daemon user
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lib
/
libalpm
/
conflict.c
Commit message (
Expand
)
Author
Age
*
add --overwrite option to ignore file conflicts
Andrew Gregory
2017-04-12
*
find_fileconflicts: rename tmpfiles -> newfiles
Andrew Gregory
2017-01-04
*
conflict: skip dir children when replacing a file
Andrew Gregory
2017-01-04
*
Update copyright years
Allan McRae
2017-01-04
*
Update copyright years for 2016
Allan McRae
2016-01-04
*
skip conflicts resolved by file replacement
Andrew Gregory
2015-12-05
*
Alpm, check for NULL in free-functions
Rikard Falkeborn
2015-10-27
*
Update copyright notices for 2015
Allan McRae
2015-02-01
*
Initialize memory to prevent issues when freeing on error
Allan McRae
2014-12-27
*
conflict_new: free memory on error
Allan McRae
2014-12-24
*
add_fileconflict: free memory on error
Allan McRae
2014-12-24
*
_alpm_conflict_dup: fix memory leak on error
Allan McRae
2014-12-24
*
fix improper FREELIST calls
Andrew Gregory
2014-09-16
*
move _alpm_lstat into util-common
Andrew Gregory
2014-08-03
*
alpm: export *_free functions
Andrew Gregory
2014-02-04
*
Remove ts and sw from vim modeline when noet is set
Florian Pritz
2014-01-28
*
Update copyright years for 2014
Allan McRae
2014-01-06
*
conflict.c: fix directory ownership check
Andrew Gregory
2013-08-21
*
improve dir->file transition conflict resolution
Andrew Gregory
2013-06-03
*
conflict.c: check for file -> dir replacements
Andrew Gregory
2013-06-03
*
conflict.c: exclude trailing slash from file path
Andrew Gregory
2013-06-03
*
conflict.c: do not ignore symlink<->dir conflicts
Andrew Gregory
2013-06-03
*
alpm_filelist: remove resolved_path
Andrew Gregory
2013-06-03
*
conflict.c: compare package pointers directly
Andrew Gregory
2013-05-05
*
Perform limited conflict checking with --force
Allan McRae
2013-02-24
*
use resolved_path for filelist_contains
Andrew Gregory
2013-02-24
*
return resolved paths from filelist_difference
Andrew Gregory
2013-02-24
*
return resolved paths from filelist_intersection
Andrew Gregory
2013-02-24
*
use alpm_list_free on filelist intersection
Andrew Gregory
2013-02-24
*
find_fileconflicts: reduce path resolution calls
Andrew Gregory
2013-02-16
*
add doxygen comments to conflict.c
Andrew Gregory
2013-01-28
*
Fix open braces style
Gerardo Exequiel Pozzi
2013-01-04
*
Update copyright year for 2013
Allan McRae
2013-01-03
*
Avoid upgrade conflict with unchanged effective path
Allan McRae
2012-12-14
*
Resolve file paths during inter-package conflict check
Allan McRae
2012-12-14
*
Split _alpm_filelist_operation function
Allan McRae
2012-08-02
*
Move filelist functions into separate source file
Dan McGee
2012-08-02
*
Merge branch 'maint'
Dan McGee
2012-08-01
|
\
|
*
Add more debug logging to dir_belongsto_pkg() function
Dan McGee
2012-08-01
*
|
lib/conflict: use a binary search within filelists
Dave Reisner
2012-08-01
*
|
Merge branch 'maint'
Dan McGee
2012-07-10
|
\
|
|
*
Check empty subdirectory ownership
Allan McRae
2012-07-10
|
*
Add conflict for replacing owned empty directory
Allan McRae
2012-07-10
*
|
fix -Wshadow warnings as reported by gcc 4.4.3
Dave Reisner
2012-05-20
*
|
Move short-lived realpath buffers to the stack
Dan McGee
2012-04-29
*
|
Update copyright years
Allan McRae
2012-02-20
*
|
include config.h via Makefiles
Dave Reisner
2011-12-21
*
|
Calculate root length only once when checking for file conflicts
Dan McGee
2011-12-12
*
|
lib/conflict: save strlen call by reusing snprintf return
Dave Reisner
2011-12-12
*
|
Merge branch 'maint'
Dan McGee
2011-11-01
|
\
|
[next]