I did "darcs pull --external-merge 'twb-meld-darcs %o %a %1 %2'",
where twb-meld-darcs is this script:

    #!/bin/bash -ex
    test 4 -eq $#
    output="$1"
    ancestor="$2"
    left="$3"
    right="$4"
    meld "$left" "$ancestor" "$right"
    cp -bf "$ancestor" "$output"

After darcs pull finished, I find that boring backup files (presumably
created by cp --backup) have been copied into my working tree and
"darcs added".

    $ darcs w -s
    M ./GNUmakefile -97 +11
    A ./GNUmakefile.~1~
    M ./Setup.hs -4 +4
    A ./Setup.hs.~1~

While I could just change "cp -bf" to "cp", I think this behaviour is
unexpected, confusing and possibly suboptimal.  Presumably darcs is
copying *all* files from the output directory into the working tree,
and then explicitly adding them (thereby overriding boring).

As I understand is the function that does the actual merge located in Darcs.Resolve called
external_resolution :: RepoPatch p => Slurpy -> String -> FL Prim C(x y) -> FL Prim C(x z)
                    -> p C(y a)
                    -> IO (Sealed (FL Prim C(a)))

So this will return a FL list of primary patches.
So I think the issue is not that the files get copied,
but they are seen as primitive patches that are additions...

Maybe we can add the check when we slurp in the output?

Hm, question is why should we use LookForAdds in the call to unsafeDiff ?

On Thu, Nov 20, 2008 at 10:31:23AM +0100, Christian Kellermann wrote:
> Thu Nov 20 10:20:35 CET 2008  Christian Kellermann <Christian.Kellermann@nefkom.net>
>   * DRAFT resolve issue1199: Backup files darcs added after external merge

This resolves 1199 for me.

The following patch updated the status of issue1199 to be resolved:

* resolve issue1199: Backup files darcs added after external merge 
Ignore-this: bc5c1365bdf4ca70073a85712f00e21c