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
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
2008-01-24
Add new public alpm_checkdbconflicts function.
Chantry Xavier
1
-3
/
+7
2008-01-22
conflict.c: move debug message out of inner loop
Dan McGee
1
-2
/
+2
2008-01-22
Move the deptest code from frontend to backend.
Chantry Xavier
1
-1
/
+1
2008-01-13
memleak fix with new dynamic depend structure
Dan McGee
1
-1
/
+1
2008-01-11
Use dynamic string allocation in package structures
Dan McGee
1
-8
/
+25
2008-01-06
conflict.c : fix for FS#8156, detect conflict between symlink and dir.
Chantry Xavier
1
-5
/
+12
2008-01-05
conflict.c : fix for upgrade042.
Chantry Xavier
1
-17
/
+7
2008-01-02
Small code cleanups with indents/spaces
Dan McGee
1
-3
/
+4
2008-01-02
new upgade042 pactest + bugfix in chk_filedifference.
Chantry Xavier
1
-0
/
+4
2007-12-11
Update GNU GPL boilerplate and copyright dates
Dan McGee
1
-4
/
+2
2007-11-25
_alpm_checkconflicts split
Nagy Gabor
1
-5
/
+24
2007-11-18
Add the pmconflict_t type.
Nagy Gabor
1
-7
/
+61
2007-11-18
Simple s/conflict/fileconflict/ renaming.
Chantry Xavier
1
-12
/
+12
2007-11-17
libalpm: use FREELIST when possible
Dan McGee
1
-4
/
+2
2007-11-17
War on whitespace
Dan McGee
1
-3
/
+3
2007-11-11
Add a horrible little hack to get symlink001.py to pass again
Dan McGee
1
-5
/
+14
2007-11-05
libalpm: use an lstat wrapper so we never dereference dir symlinks
Dan McGee
1
-2
/
+2
2007-10-29
libalpm: introduce MALLOC and CALLOC macros
Dan McGee
1
-6
/
+3
2007-08-24
libalpm: add newlines to all strings passed to log callback
Dan McGee
1
-14
/
+14
2007-08-22
Post trial install changes, round one
Dan McGee
1
-1
/
+1
2007-08-14
Code cleanup
Dan McGee
1
-3
/
+0
2007-08-13
libalpm/conflict.c : small speed-up and fix.
Nagy Gabor
1
-6
/
+5
2007-08-13
libalpm/conflict.c : small memleak fix.
Nagy Gabor
1
-0
/
+1
2007-08-13
Add two pactest for versioned conflicts.
Nagy Gabor
1
-9
/
+1
2007-07-20
libalpm/conflict.c : cleanup + fix for conflict001.
Chantry Xavier
1
-167
/
+82
2007-07-13
Remove conflict message for non-existent files (reworked)
Chantry Xavier
1
-5
/
+7
2007-07-11
conflict.c: start cleaning conflict check functions
Chantry Xavier
1
-17
/
+7
2007-07-10
Remove gettext calls from all PM_LOG_DEBUG messages
Dan McGee
1
-9
/
+10
2007-07-10
Remove conflict message for no-existent files.
Andrew Fyfe
1
-1
/
+2
2007-04-29
Remove STRNCPY macro from libalpm
Dan McGee
1
-3
/
+3
2007-04-27
Clean up gettext on the libalpm side
Dan McGee
1
-1
/
+0
2007-03-22
* Fix conflict checking to ignore symlinks that were in previous version of
Dan McGee
1
-8
/
+30
2007-03-05
This commit looks much more monumental than it is. Almost all just #include
Dan McGee
1
-7
/
+8
2007-03-03
* Remove unnecessary call to _alpm_trans_update_depends that was erroring
Dan McGee
1
-0
/
+2
2007-03-03
* A little more hacking with wchar_t output, but nothing really changed in
Dan McGee
1
-2
/
+2
2007-03-03
Big commit this time:
Aaron Griffin
1
-145
/
+196
2007-02-22
* debug cleanup (more)
Aaron Griffin
1
-24
/
+29
2007-02-22
* Cleaned up some debug output
Aaron Griffin
1
-9
/
+19
[next]