[darcs-devel] [issue343] external-merge does not handle add conflicts well

[Eric Kow]

New submission from Eric Kow <eric.kow at gmail.com>:

The following dies because the file that is added on both sides does not
exist in the ancestor and the external program (reasonably) complains.
I guess this is something that happens rarely enough for it to be
relatively unimportant, but it may be worth fixing.

---------8<----------------

mkdir un
cd un
darcs init
touch a
darcs add a
darcs record --all --author moi -m "a"
cd ..

mkdir deux 
cd deux 
darcs init
touch a
darcs add a
darcs record --all --author moi -m "a"
cd ..

cd deux
darcs pull ../un --external-merge="opendiff %1 %2 -ancestor %a -merge %o"

----------
messages: 1208
nosy: EricKow, droundy, tommy
status: unread
title: external-merge does not handle add conflicts well

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue343>
____________________________________