index
:
pacman
master
threads
working
working-maint
Main repository is at http://projects.archlinux.org/pacman.git/
Florian Pritz
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
lib
/
libalpm
/
conflict.c
Age
Commit message (
Expand
)
Author
Files
Lines
2013-01-28
add doxygen comments to conflict.c
Andrew Gregory
1
-14
/
+80
2013-01-04
Fix open braces style
Gerardo Exequiel Pozzi
1
-1
/
+2
2013-01-03
Update copyright year for 2013
Allan McRae
1
-1
/
+1
2012-12-14
Avoid upgrade conflict with unchanged effective path
Allan McRae
1
-0
/
+1
2012-12-14
Resolve file paths during inter-package conflict check
Allan McRae
1
-0
/
+5
2012-08-02
Split _alpm_filelist_operation function
Allan McRae
1
-6
/
+6
2012-08-02
Move filelist functions into separate source file
Dan McGee
1
-86
/
+11
2012-08-01
Merge branch 'maint'
Dan McGee
1
-1
/
+8
2012-08-01
lib/conflict: use a binary search within filelists
Dave Reisner
1
-8
/
+5
2012-08-01
Add more debug logging to dir_belongsto_pkg() function
Dan McGee
1
-1
/
+8
2012-07-10
Merge branch 'maint'
Dan McGee
1
-6
/
+31
2012-07-10
Check empty subdirectory ownership
Allan McRae
1
-0
/
+5
2012-07-10
Add conflict for replacing owned empty directory
Allan McRae
1
-6
/
+26
2012-05-21
fix -Wshadow warnings as reported by gcc 4.4.3
Dave Reisner
1
-2
/
+2
2012-04-30
Move short-lived realpath buffers to the stack
Dan McGee
1
-2
/
+1
2012-02-20
Update copyright years
Allan McRae
1
-1
/
+1
2011-12-22
include config.h via Makefiles
Dave Reisner
1
-2
/
+0
2011-12-12
Calculate root length only once when checking for file conflicts
Dan McGee
1
-3
/
+5
2011-12-12
lib/conflict: save strlen call by reusing snprintf return
Dave Reisner
1
-2
/
+3
2011-11-01
Merge branch 'maint'
Dan McGee
1
-14
/
+19
2011-10-27
Fix issues with replacing unowned symlinks
Dan McGee
1
-14
/
+19
2011-10-14
Make _alpm_filelist_contains() NULL-safe
Dan McGee
1
-3
/
+7
2011-09-27
Ensure fileconflict value is actually a string
Dan McGee
1
-16
/
+14
2011-09-03
Former transaction callback rename refactor
Dan McGee
1
-2
/
+2
2011-09-03
Move all callbacks up to the handle level
Dan McGee
1
-3
/
+2
2011-08-30
Remove outdated comment for _alpm_outerconflicts
Allan McRae
1
-4
/
+1
2011-08-18
Remove use of no-op accessor functions in library
Dan McGee
1
-3
/
+2
2011-08-15
Parse conflicts/provides/replaces at database load time
Dan McGee
1
-11
/
+10
2011-08-09
Conflict comparison performance enhancements
Dan McGee
1
-17
/
+17
2011-07-21
Convert package filelists to an array instead of linked list
Dan McGee
1
-29
/
+36
2011-07-14
Allow fileconflict if unowned file moving into backup array
Dan McGee
1
-0
/
+16
2011-07-03
Merge remote-tracking branch 'allan/ALPM'
Dan McGee
1
-21
/
+21
2011-07-03
conflict code tweaks and cleanups
Dan McGee
1
-20
/
+14
2011-07-03
Move alpm filelists to a struct object
Dan McGee
1
-16
/
+39
2011-07-01
Prefix _alpm_errno_t members with ALPM
Allan McRae
1
-3
/
+3
2011-07-01
Prefix alpm_transprog_t members with ALPM
Allan McRae
1
-2
/
+2
2011-07-01
Prefix alpm_loglevel_t members with ALPM
Allan McRae
1
-13
/
+13
2011-07-01
Prefix alpm_fileconflicttype_t members with ALPM
Allan McRae
1
-3
/
+3
2011-06-30
Fix a few warnings pointed out via clang scan-build
Dan McGee
1
-1
/
+1
2011-06-28
Rename pmfileconflict_t to alpm_fileconflict_t
Allan McRae
1
-4
/
+4
2011-06-28
Rename pmconflict_t to alpm_conflict_t
Allan McRae
1
-11
/
+11
2011-06-28
Rename pmdepend_t to alpm_depend_t
Allan McRae
1
-1
/
+1
2011-06-28
Rename pmtrans_t to alpm_trans_t
Allan McRae
1
-1
/
+1
2011-06-28
Rename pmpkg_t to alpm_pkg_t
Allan McRae
1
-6
/
+6
2011-06-28
Rename pmdb_t to alpm_db_t
Allan McRae
1
-1
/
+1
2011-06-28
Rename pmhandle_t to alpm_handle_t
Allan McRae
1
-6
/
+6
2011-06-28
Rename pmfileconflicttype_t to alpm_fileconflicttype_t
Allan McRae
1
-1
/
+1
2011-06-27
Merge branch 'maint'
Dan McGee
1
-13
/
+22
2011-06-27
Ensure a file can be replaced by a directory
Dan McGee
1
-8
/
+18
2011-06-27
File conflict code cleanups
Dan McGee
1
-11
/
+11
[next]