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>

1 files changed, 0 insertions, 2 deletions

diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py
index 19a7f099..1ba7c025 100644
--- a/test/pacman/tests/symlink021.py
+++ b/test/pacman/tests/symlink021.py
@@ -24,5 +24,3 @@ self.addrule("FILE_TYPE=usr/include/foo|dir")
 self.addrule("!FILE_TYPE=usr/include/bar|link")
 self.addrule("FILE_EXIST=usr/include/foo/header.h")
 self.addrule("FILE_EXIST=usr/include/bar/header.h")
-
-self.expectfailure = True