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
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
2007-02-21
* Re-added a compare function for syncpkg's - it was removed without thinking
Aaron Griffin
1
-1
/
+9
2007-02-20
* Updated conflict checking one last time. You can finally have a file move
Dan McGee
1
-40
/
+43
2007-02-19
* Added some improved debug output to file conflict checking.
Dan McGee
1
-27
/
+30
2007-02-14
* Updated a too-verbose message in pacman/add.c. (shouldn't be an issue withi
Dan McGee
1
-102
/
+123
2007-02-14
Slightly optimized to remove duplicate strcmp operation.
Dan McGee
1
-7
/
+14
2007-02-13
* Refactored conflict checking within packages. Profiling from Dan showed an
Aaron Griffin
1
-26
/
+46
2007-01-30
K. Piche <kevin.piche@cgi.com>
Aaron Griffin
1
-0
/
+12
2007-01-30
K. Piche <kpiche@rogers.com>
Aaron Griffin
1
-4
/
+4
2007-01-30
Discussed on IRC for a bit, this makes the following changes for clarity:
Dan McGee
1
-3
/
+4
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
-31
/
+31
2007-01-18
Dan McGee <dpmcgee@gmail.com>
Aaron Griffin
1
-2
/
+6
2006-11-22
* Completed getinfo api changes (pmmissing_t, pmtrans_t, etc)
Aaron Griffin
1
-0
/
+37
2006-11-20
* repo-add script - to add entries to a db file directly from package data (n...
Aaron Griffin
1
-0
/
+2
2006-10-31
Numerous changes:
Aaron Griffin
1
-2
/
+2
2006-10-20
A handful of minor changes:
Aaron Griffin
1
-14
/
+14
2006-10-16
Copyright changes
Aaron Griffin
1
-0
/
+1
2006-10-16
Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>
Aaron Griffin
1
-2
/
+5
2006-10-16
Applied changes from frugalware:
Aaron Griffin
1
-3
/
+1
2006-10-15
Merged frugalware changes (too many to list). Also added some config file
Aaron Griffin
1
-9
/
+9
2006-05-15
first stage of i18n stuff from VMiklos
Judd Vinet
1
-13
/
+14
2006-03-07
removed db_scan calls - take 2
Aurelien Foret
1
-1
/
+0
2006-03-07
removed db_scan calls
Aurelien Foret
1
-3
/
+20
2006-03-04
added more debug logs
Aurelien Foret
1
-1
/
+4
2006-03-02
code cleanup
Aurelien Foret
1
-3
/
+1
2006-02-22
conflict checks: when doing db-vs-target checks, opt to use the NEWER, to-be...
Judd Vinet
1
-2
/
+20
2006-02-17
prepend library function names with _alpm (helped with the patch from VMiklos...
Aurelien Foret
1
-31
/
+30
2006-02-05
added a pmconflict_t structure to handle file conflicts
Aurelien Foret
1
-11
/
+16
2006-02-01
fixed typos in 2 debug logs
Aurelien Foret
1
-2
/
+2
2006-01-18
more code cleanup yet
Aurelien Foret
1
-54
/
+24
2006-01-17
fixed detection for duplicate entries in list of deps/conflicts
Aurelien Foret
1
-6
/
+6
2006-01-17
reworked log messages
Aurelien Foret
1
-6
/
+6
2006-01-17
- code cleanup
Aurelien Foret
1
-6
/
+6
2006-01-15
pulled out conflict checkings from checkdeps() in its own function: checkconf...
Aurelien Foret
1
-0
/
+172
2006-01-02
patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSION
Judd Vinet
1
-1
/
+1
2006-01-02
fixed a possible memory corruption
Aurelien Foret
1
-1
/
+1
2005-10-08
Merging in recent fixes/additions from 2.9.7
Judd Vinet
1
-67
/
+71
2005-10-06
Added a CYGWIN define to include header files required to build in a Cygwin e...
Aurelien Foret
1
-0
/
+3
2005-04-24
fixed a commented MLK in db_find_conflicts()/CHECK1
Aurelien Foret
1
-0
/
+1
2005-03-22
moved db_find_conflicts from db.c to conflict.c
Aurelien Foret
1
-0
/
+162