[darcs-devel] [issue1199] Backup files darcs added after external merge

[Trent Buck]

New submission from Trent Buck <trentbuck at gmail.com>:

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).

----------
messages: 6584
nosy: dagit, dmitry.kurochkin, kowey, simon, thorkilnaur, twb
status: unread
title: Backup files darcs added after external merge

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1199>
__________________________________