[darcs-users] Directory conflict causing exponential time and surprising results

[David Roundy]

On Sun, Sep 05, 2004 at 10:36:37PM +0200, Tomasz Zielonka wrote:
> Hello!
> 
> I encountered a situation in which (recent) darcs takes very long time
> to complete and the result is a bit surprising. This happens when you
> have a conflicting adddir Dir with some (independent) files in Dir in
> both repos and some file outside the Dir modified in a specific order.
> The merge seems to take time exponential in the number of files/hunks in
> the Dir.
> 
> What's surprising is that after the merge files from one of the repos
> are missing from the Dir.

This is a known post-1.0.0 issue.  Handling of conflicts in general tends
to involve exponential time, and I have some major-change sorts of ideas
that may help with this.
-- 
David Roundy
http://www.abridgegame.org