diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-01-03 08:06:22 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2017-01-04 04:59:15 +0100 |
| commit | b6753eeb7ead3fa7bfdb053babe877319a722115 (patch) | |
| tree | a52ce452c8be2d07741c5dd9738819accc3e799d /.mailmap | |
| parent | 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 (diff) | |
| download | pacman-b6753eeb7ead3fa7bfdb053babe877319a722115.tar.gz pacman-b6753eeb7ead3fa7bfdb053babe877319a722115.tar.xz | |
conflict: skip dir children when replacing a file
When replacing a file with a directory, any files under that directory
do not need to be checked for conflicts. This prevents possible
false-positive conflicts where the file being replaced is a symlink.
We were already skipping the directory children when the file was owned
by the previous version of a package being upgraded. This extends that
to other packages being removed.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions