[darcs-users] unexpected merge conflicts

[David Roundy]

On Sun, May 18, 2003 at 02:16:24PM +0300, Aggelos Economopoulos wrote:
> On Sunday 18 May 2003 12:50, David Roundy wrote:
> > Could you run a quick
> >
> > diff -ru _darcs/patches ../messedupversion/_darcs/patches
> >
> > to see where the difference might be? I'd be interested in seeing the
> > output of that... I presume that an earlier patch must have gotten itself
> > corrupted...
> 
> diff output is attached.

Ooops.  To interperet this I'll also need

diff -u darcs/_darcs/inventory broken.darcs/_darcs/inventory

and perhaps

diff -ru darcs/_darcs/inventories/ broken.darcs/_darcs/inventories/

So I can see what order the patches are in.
-- 
David Roundy
http://www.abridgegame.org