Allan McRae 34749e177d 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>

2013-02-24 13:11:54 +10:00

..

.gitignore

Add man page for pactree

2012-07-10 08:02:08 -05:00

asciidoc-override.css

doc: update .gitignore, add CSS override for new tables usage

2011-10-13 14:53:52 -05:00

asciidoc.conf

doc: add a few more escapes and fix usage of {}

2011-06-01 11:46:13 -05:00

Doxyfile

Update Doxyfile

2013-01-03 12:03:10 +10:00

footer.txt

Update authors and contributors

2011-08-16 11:46:44 -05:00

index.txt

Fix release dates

2013-01-17 22:32:54 +10:00

libalpm.3.txt

Unify modelines in Asciidoc files

2011-07-28 11:42:08 -05:00

Makefile.am

Merge branch 'maint'

2012-07-10 08:41:18 -05:00

makepkg.8.txt

Add --needed option to makepkg

2012-11-27 15:16:15 +10:00

makepkg.conf.5.txt

makepkg: add support for .pkg.tar.lzo

2013-02-16 11:06:43 +10:00

pacman-key.8.txt

doc: Fix section link in pacman-key man page

2013-01-03 12:03:10 +10:00

pacman.8.txt

Perform limited conflict checking with --force

2013-02-24 13:11:54 +10:00

pacman.conf.5.txt

Document LocalFileSigLevel and RemoteFileSigLevel

2013-02-07 10:48:11 +10:00

pactree.8.txt

pactree: autodetect and use unicode line drawing characters

2012-11-27 15:16:15 +10:00

PKGBUILD-example.txt

Update PKGBUILD example

2011-05-02 10:04:13 -05:00

PKGBUILD.5.txt

doc: update PKGBUILD man page

2013-02-07 10:48:11 +10:00

pkgdelta.8.txt

pkgdelta: use human_to_size to parse --min-pkg-size

2012-06-25 23:39:28 -05:00

repo-add.8.txt

Add a -n option to repo-add to only add new packages

2013-01-03 12:03:10 +10:00

submitting-patches.txt

Unify modelines in Asciidoc files

2011-07-28 11:42:08 -05:00

translation-help.txt

Unify modelines in Asciidoc files

2011-07-28 11:42:08 -05:00

vercmp.8.txt

doc/vercmp: add note about pkgrel handling

2012-01-12 17:30:08 -06:00