[darcs-devel] unresolvable conflicts in darcs-unstable?

[David Roundy]

On Sat, Apr 09, 2005 at 03:43:55PM +0200, Tommy Pettersson wrote:
> When I do 'darcs resolve' in stable darcs I get "No conflicts
> to resolve."  But when I do the same in darcs-unstable I
> get "Finished resolving.", which means there are conflict
> in darcs-unstable.  But when I pull --all from unstable to
> stable there is no messages about conflicts.
>
> Whatsnew doesn't show anything, and revert says there is
> nothing to revert.
> 
> So, is there a conflict or not, and is it a bad thing?

Thanks for pointing this out!

This was actually a bug in is_null_patch (or that's how I'm interpereting
it, anyways).  The conflict resolution was {{}}, which wasn't recognized as
an empty patch.  It's fixed now with the latest darcs-unstable.
-- 
David Roundy
http://www.darcs.net