pacman - Main repository is at http://projects.archlinux.org/pacman.git/

Age	Commit message (Expand)	Author	Files	Lines
2017-04-12	add --overwrite option to ignore file conflicts	Andrew Gregory	1	-4/+10
2017-01-04	find_fileconflicts: rename tmpfiles -> newfiles	Andrew Gregory	1	-6/+6
2017-01-04	conflict: skip dir children when replacing a file	Andrew Gregory	1	-1/+15
2017-01-04	Update copyright years	Allan McRae	1	-1/+1
2016-01-04	Update copyright years for 2016	Allan McRae	1	-1/+1
2015-12-05	skip conflicts resolved by file replacement	Andrew Gregory	1	-0/+15
2015-10-27	Alpm, check for NULL in free-functions	Rikard Falkeborn	1	-0/+2
2015-02-01	Update copyright notices for 2015	Allan McRae	1	-1/+1
2014-12-27	Initialize memory to prevent issues when freeing on error	Allan McRae	1	-2/+2
2014-12-24	conflict_new: free memory on error	Allan McRae	1	-2/+6
2014-12-24	add_fileconflict: free memory on error	Allan McRae	1	-0/+1
2014-12-24	_alpm_conflict_dup: fix memory leak on error	Allan McRae	1	-2/+6
2014-09-16	fix improper FREELIST calls	Andrew Gregory	1	-2/+6
2014-08-03	move _alpm_lstat into util-common	Andrew Gregory	1	-1/+1
2014-02-04	alpm: export *_free functions	Andrew Gregory	1	-3/+3
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-08-21	conflict.c: fix directory ownership check	Andrew Gregory	1	-4/+12
2013-06-03	improve dir->file transition conflict resolution	Andrew Gregory	1	-68/+65
2013-06-03	conflict.c: check for file -> dir replacements	Andrew Gregory	1	-19/+20
2013-06-03	conflict.c: exclude trailing slash from file path	Andrew Gregory	1	-6/+6
2013-06-03	conflict.c: do not ignore symlink<->dir conflicts	Andrew Gregory	1	-7/+0
2013-06-03	alpm_filelist: remove resolved_path	Andrew Gregory	1	-13/+1
2013-05-04	conflict.c: compare package pointers directly	Andrew Gregory	1	-3/+5
2013-02-24	Perform limited conflict checking with --force	Allan McRae	1	-2/+26
2013-02-24	use resolved_path for filelist_contains	Andrew Gregory	1	-0/+5
2013-02-24	return resolved paths from filelist_difference	Andrew Gregory	1	-22/+14
2013-02-24	return resolved paths from filelist_intersection	Andrew Gregory	1	-2/+2
2013-02-24	use alpm_list_free on filelist intersection	Andrew Gregory	1	-1/+1
2013-02-16	find_fileconflicts: reduce path resolution calls	Andrew Gregory	1	-4/+6
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