The "meld" tool can do a three-way merge of entire directories.  It
would be nice if darcs was able to invoke meld just once on the entire
dir triplet tree, rather than once per file triplet.

I'm really surprised that our external resolution doesn't already work this way
(external diff does, for what it's worth).

Darcs.Resolution.external_resolution is what you're looking for, and I think
this is something that's used infrequently enough that we can make the UI change
and apologise later.

On Tue, Aug 18, 2009 at 09:03:24PM +0000, Eric Kow wrote:
> Darcs.Resolution.external_resolution is what you're looking for, and
> I think this is something that's used infrequently enough that we
> can make the UI change and apologise later.

-1

AFAIK most external merge utilities can take two files to merge, but
can't (meaningfully) take two directory trees to (recursively) merge.
I don't think we should ASSUME that merge utils can merge trees.

Two points that we need to resolve (by thinking real hard and/or by
discussion on darcs-users):

- how to deal with mv patches nicely
- how to deal with tools that don't know about dir-wide diff (eg.
provide a wrapper script in contrib/?)