1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-17 23:05:00 -05:00
pacman/test
Andrew Gregory 4838d250e5 skip conflicts resolved by file replacement
When replacing a file with a directory, any files inside the new
directory cannot possibly exist on the filesystem and can be skipped.
This allows cross-package symlink-to-directory transitions when there
are files with the same name under both the symlinked directory and the
new directory.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
2015-12-05 17:46:22 +10:00
..
pacman skip conflicts resolved by file replacement 2015-12-05 17:46:22 +10:00
scripts makepkg-template: support multiple --template-dirs 2015-05-12 14:00:54 +10:00
util Update copyright notices for 2015 2015-02-01 21:19:04 +10:00
.gitignore Push down testing .gitignore entries 2014-01-06 14:38:50 +10:00
tap.sh use tap.sh for bash tests 2014-12-28 13:06:28 +10:00