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.h
Age
Commit message (
Expand
)
Author
Files
Lines
2017-01-04
Update copyright years
Allan McRae
1
-1
/
+1
2016-09-25
Do not #define _RESERVED_IDENTIFIERS
Ivy Foster
1
-3
/
+3
2016-01-04
Update copyright years for 2016
Allan McRae
1
-1
/
+1
2015-02-01
Update copyright notices for 2015
Allan McRae
1
-1
/
+1
2014-02-04
alpm: export *_free functions
Andrew Gregory
1
-3
/
+0
2014-01-28
Remove ts and sw from vim modeline when noet is set
Florian Pritz
1
-1
/
+1
2014-01-06
Update copyright years for 2014
Allan McRae
1
-1
/
+1
2013-01-03
Update copyright year for 2013
Allan McRae
1
-1
/
+1
2012-08-02
Move filelist functions into separate source file
Dan McGee
1
-3
/
+0
2012-02-20
Update copyright years
Allan McRae
1
-1
/
+1
2011-07-21
Convert package filelists to an array instead of linked list
Dan McGee
1
-2
/
+2
2011-07-03
Move alpm filelists to a struct object
Dan McGee
1
-0
/
+3
2011-06-28
Rename pmfileconflict_t to alpm_fileconflict_t
Allan McRae
1
-1
/
+1
2011-06-28
Rename pmconflict_t to alpm_conflict_t
Allan McRae
1
-2
/
+2
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
-2
/
+2
2011-06-16
Make struct pmconflict_t public
Dan McGee
1
-6
/
+0
2011-06-16
Make pmfileconflict_t type public
Dan McGee
1
-7
/
+0
2011-06-14
Move pm_errno onto the handle
Dan McGee
1
-1
/
+0
2011-06-14
Require handle for alpm_checkconflicts()
Dan McGee
1
-1
/
+1
2011-06-03
Remove global handle dependencies from sync/upgrade paths
Dan McGee
1
-2
/
+2
2011-02-17
Conflict checking code cleanup
Dan McGee
1
-1
/
+0
2011-01-08
Update copyright years for 2011
Allan McRae
1
-1
/
+1
2010-03-15
Bump copyright dates to 2010
Dan McGee
1
-1
/
+1
2009-09-09
Add a new reason field to pmconflict_t struct
Nagy Gabor
1
-1
/
+2
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
-1
/
+2
2008-01-27
New _alpm_conflict_dup function
Nagy Gabor
1
-0
/
+1
2008-01-24
Add new public alpm_checkdbconflicts function.
Chantry Xavier
1
-1
/
+0
2008-01-11
Use dynamic string allocation in package structures
Dan McGee
1
-7
/
+8
2007-12-11
Update GNU GPL boilerplate and copyright dates
Dan McGee
1
-4
/
+2
2007-11-25
_alpm_checkconflicts split
Nagy Gabor
1
-0
/
+2
2007-11-18
Add the pmconflict_t type.
Nagy Gabor
1
-0
/
+7
2007-11-18
Simple s/conflict/fileconflict/ renaming.
Chantry Xavier
1
-3
/
+3
2007-11-17
War on whitespace
Dan McGee
1
-3
/
+3
2007-03-05
This commit looks much more monumental than it is. Almost all just #include
Dan McGee
1
-1
/
+2
2007-02-20
* Updated conflict checking one last time. You can finally have a file move
Dan McGee
1
-1
/
+1
2007-01-24
This mainly deals with code clarity- removing currently unneeded
Aaron Griffin
1
-1
/
+1
2007-01-19
Preliminary checkin for alpm_list conversion
Aaron Griffin
1
-2
/
+2
2006-11-20
* repo-add script - to add entries to a db file directly from package data (n...
Aaron Griffin
1
-2
/
+3
2006-10-20
A handful of minor changes:
Aaron Griffin
1
-2
/
+2
2006-10-16
Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>
Aaron Griffin
1
-1
/
+1
2006-02-17
prepend library function names with _alpm (helped with the patch from VMiklos...
Aurelien Foret
1
-2
/
+2
2006-02-05
added a pmconflict_t structure to handle file conflicts
Aurelien Foret
1
-0
/
+9
2006-01-15
pulled out conflict checkings from checkdeps() in its own function: checkconf...
Aurelien Foret
1
-0
/
+1
2006-01-02
patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSION
Judd Vinet
1
-1
/
+1
2005-10-08
Merging in recent fixes/additions from 2.9.7
Judd Vinet
1
-1
/
+1
2005-03-22
moved db_find_conflicts from db.c to conflict.c
Aurelien Foret
1
-0
/
+30