From 34749e177db5d4aafdb9f3de630c7ab193a0f36d Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Tue, 12 Feb 2013 22:00:53 +1000
Subject: 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>
---
 doc/pacman.8.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

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*::
-- 
cgit v1.2.3-70-g09d2