[darcs-users] unexpected merge conflicts

[David Roundy]

On Sun, May 18, 2003 at 02:34:13AM +0300, Aggelos Economopoulos wrote:
> On Friday 16 May 2003 23:36, David Roundy wrote:
> > On Fri, May 16, 2003 at 09:40:08PM +0300, Aggelos Economopoulos wrote:
> 
 [snip]

> > If that all sounds like too much work, you could darcs get a clean version
> > of darcs.
> 
> that's what I ended up doing (I've kept the old tree, though, available on 
> request).

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...

Also could you try a `darcs check --no-test` to make sure the repo that's
causing problems is internally consistent?
-- 
David Roundy
http://www.abridgegame.org