[pacman-dev] Fileconflict error...

[Dan McGee]

On Tue, Jul 22, 2008 at 8:20 AM, Xavier <shiningxc at gmail.com> wrote:
> Anyway, I still did a git bisect with manual testing for fun, and the
> result is funny :)
>
> """"
> 584ffa6aef13d0933ad4930ab9cb70d3af2977ff is first bad commit
> commit 584ffa6aef13d0933ad4930ab9cb70d3af2977ff
> Author: Dan McGee <dan at archlinux.org>
> Date:   Mon May 12 20:49:18 2008 -0500
>
>    Remove an outdated exception check in file conflict code
>
>    This has been around since at least pacman 2.9.8. Frugalware just dumped it
>    in commit 113ec73bfcfdc, and deleting it here and running pactest shows that
>    nothing that we have actually tested changes. If someone can pactest the
>    edge case where this is needed, then show me the money.
>
>    Signed-off-by: Dan McGee <dan at archlinux.org>
>
> :040000 040000 ea3e9f52732a5412f2e77e2a1060c3247636de7b
> a234d7e4ca725edc301f696640d897ce54dfb3b8 M      lib
> """"
>
> Well here you go, the pactest is called fileconflict004, courtesy of Nagy ;)

And if we want to toss some fireworks around, reverting this commit
would fix 004 as well (at the expense of 003). :P

commit a71f4c4c6a7775503b29ab856f8a5ce2801f2967
Author: Chantry Xavier <shiningxc at gmail.com>
Date:   Sun Jan 6 10:59:41 2008 +0100

    conflict.c : fix for FS#8156, detect conflict between symlink and dir.