[darcs-devel] Re: darcs-unstable fails to compile

[David Roundy]

On Sat, Apr 02, 2005 at 01:17:58PM +0000, Mark Stosberg wrote:
> Resolve shows something 'interesting':
> 
>   Fail: bug in darcs!
>   Problem resolving conflicts in resolve!
>   Please report this to bugs at darcs.net,
>   If possible include the output of 'darcs --exact-version'.
> 
> That's from Mandrake's 1.0.2 binary. 

Okay, this is I believe a known problem.  You may be able to work around it
by running optimize before resolve.  I hope to have a semi-fix,
semi-workaround for this later today.  Although the tests have been failing
again (it's unit this time, so it's definitely my fault), so I'm not sure
when the change will make it into the central repository.

> 'darcs check' thinks the repo is consistent.
> 
> Although my memory is not strong, It's possible I got a 'conflict' in
> that file while updating recently, and resolved it with a 'revert'. I
> figured since I hadn't made code modifications to that file myself, that 
> this was a reasonable solution. Darcs didn't complain. :)
> 
> Maybe that was the wrong thing to do, but since I'm not a Haskell
> programmer, guessing which piece of code was correct wouldn't have been
> any better.
> 
> Maybe if 'resolve' worked, it would re-introduce that conflict for me? 

Indeed, it would have helped.  You could try darcs changes -s Record.lhs,
and look for patches with exclamation points.  That may indicate where the
problem is.
-- 
David Roundy
http://www.darcs.net