[pacman-dev] [PATCH] conflict: skip dir children when replacing a file

[Allan McRae]

On 03/01/17 15:37, Allan McRae wrote:
> On 18/12/16 00:57, Andrew Gregory wrote:
>> 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.
>>
> 
> OK


NOT OK...

You missed including the test file:

 lib/libalpm/conflict.c  | 16 +++++++++++++++-
 test/pacman/tests/TESTS |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)