Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2015-12-04 14:14:32 -0500
committerAllan McRae <allan@archlinux.org>2015-12-05 17:46:22 +1000
commit4838d250e5fc258bdd52dc31098ed2ad0e44ee40 (patch)
tree3542dbadea732d9b2e0d29b8aac1102b70c91b3e /test
parentbb5e6c3b767e923fdb6cbdd75a930838c9b2a018 (diff)
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>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/symlink021.py2
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