summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-02-12 22:00:53 +1000
committerAllan McRae <allan@archlinux.org>2013-02-24 13:11:54 +1000
commit34749e177db5d4aafdb9f3de630c7ab193a0f36d (patch)
tree93d21fc0a0c170589acf19617e15cd9d9d8949d1 /doc
parent19754b34a36203266c4e02f29178084c77282efd (diff)
downloadpacman-34749e177db5d4aafdb9f3de630c7ab193a0f36d.tar.xz
Perform limited conflict checking with --force
Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 358d5065..33a94214 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -205,6 +205,8 @@ Upgrade Options (apply to '-S' and '-U')[[UO]]
Bypass file conflict checks and overwrite conflicting files. If the
package that is about to be installed contains files that are already
installed, this option will cause all those files to be overwritten.
+ Using '--force' will not allow overwriting a directory with a file or
+ installing packages with conflicting files and directories.
This option should be used with care, ideally not at all.
*\--asdeps*::