[darcs-devel] bug in get_extra revival

[David Roundy]

On Sun, May 01, 2005 at 11:29:53PM +0200, Tomasz Zielonka wrote:
> I managed to reduce the test case. I attach three patch bundles, all
> to be applied to tag 1.0.2:

Thanks for tracking this down!

>   to      - a repo to pull to
>   from    - a repo to pull from, causes get_extra bug
>   from-ok - a repo to pull from, doesn't cause get_extra bug
> 
> Note that 'from' and 'from-ok' contain the same set of patches,
> but in different order.

Argh.  This is a case of eight-deep nested mergers.  :( I'm afraid it may
not be worth tracking down exactly why exactly this fails.  I'd rather
invest the time in the replacement conflictor code, which I have greater
confidence will be bug-free than the merger code.  :(
-- 
David Roundy
http://www.darcs.net