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
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
2011-06-16
Make struct pmconflict_t public
Dan McGee
1
-18
/
+0
2011-06-16
Make pmfileconflict_t type public
Dan McGee
1
-24
/
+0
2011-06-14
Ensure handle is valid and pm_errno is reset when calling into API
Dan McGee
1
-0
/
+1
2011-06-14
Conflict check and skip_remove code cleanups
Dan McGee
1
-34
/
+50
2011-06-14
Switch all logging to use handle directly
Dan McGee
1
-32
/
+38
2011-06-14
Move pm_errno onto the handle
Dan McGee
1
-32
/
+33
2011-06-14
Require handle for alpm_checkconflicts()
Dan McGee
1
-8
/
+12
2011-06-09
Kill all remaining 'PATH_MAX + 1' usages
Dan McGee
1
-3
/
+3
2011-06-03
Remove global handle dependencies from sync/upgrade paths
Dan McGee
1
-9
/
+7
2011-06-03
Push down extern handle variable to files that need it
Dan McGee
1
-0
/
+3
2011-06-03
Remove unnecessary handle != NULL asserts
Dan McGee
1
-7
/
+0
2011-06-03
Remove ALPM_LOG_FUNC macro
Dan McGee
1
-24
/
+0
2011-05-04
Fix warnings reported by -Wwrite-strings
Dan McGee
1
-5
/
+3
2011-03-31
Unify filelist operation functions in conflict checking
Dan McGee
1
-51
/
+25
2011-03-21
Style change: return(x) --> return x
Dan McGee
1
-31
/
+31
2011-02-25
alpm: alpm_db_get_pkgcache_list => alpm_db_get_pkgcache
Dave Reisner
1
-1
/
+1
2011-02-17
Conflict checking code cleanup
Dan McGee
1
-30
/
+13
2011-02-11
Fix fileconflict progress with only one package
Dan McGee
1
-2
/
+4
2011-02-04
Read pkgcache into hash
Allan McRae
1
-2
/
+2
2011-01-10
Remove need for floating point division in backend
Dan McGee
1
-2
/
+2
2011-01-08
Fix some more simple conversion "errors"
Dan McGee
1
-2
/
+2
2011-01-08
Use size_t for alpm_list sizes
Allan McRae
1
-2
/
+2
2011-01-08
Update copyright years for 2011
Allan McRae
1
-1
/
+1
2010-12-13
alpm: don't expose alpm_depcmp
Xavier Chantry
1
-1
/
+1
2010-10-13
Move the cache stuff where it should be
Dan McGee
1
-1
/
+0
2010-08-24
Fix some whitespace issues
Allan McRae
1
-1
/
+1
2010-06-20
Clarify testing within conditional statements
Allan McRae
1
-2
/
+2
2010-03-15
Bump copyright dates to 2010
Dan McGee
1
-1
/
+1
2010-03-15
fix a few warnings reported by clang
Xavier Chantry
1
-1
/
+1
2009-09-09
Remove transaction type
Xavier Chantry
1
-1
/
+1
2009-09-09
Add a new reason field to pmconflict_t struct
Nagy Gabor
1
-5
/
+19
2009-07-20
Fix 2 minor memleaks
Xavier Chantry
1
-1
/
+1
2009-07-20
Fix klibc conflict case.
Xavier Chantry
1
-0
/
+13
2009-07-20
Fix fileconflict004
Xavier Chantry
1
-0
/
+57
2009-07-01
Update copyright headers and messages
Dan McGee
1
-1
/
+2
2009-04-11
Fix for trans001.py (FS#9088)
Nagy Gabor
1
-45
/
+45
2008-10-13
Merge branch 'maint'
Dan McGee
1
-1
/
+0
2008-10-13
Remove unnecessary unistd.h header inclusion
Dan McGee
1
-1
/
+0
2008-08-26
Change checkdeps and checkdbconflicts to be more flexible.
Xavier Chantry
1
-3
/
+3
2008-05-13
Remove an outdated exception check in file conflict code
Dan McGee
1
-20
/
+0
2008-04-07
Remove unnecessary header file, move one macro to util.c
Dan McGee
1
-1
/
+0
2008-02-16
Merge branch 'maint'
Dan McGee
1
-4
/
+10
2008-02-12
ensure chk_fileconflicts reads entire file list
Dan McGee
1
-4
/
+10
2008-01-27
New _alpm_conflict_dup function
Nagy Gabor
1
-0
/
+11
[prev]
[next]