[darcs-users] darcs2 and hidden cionflicts

[Eric Kow]

> Could you create a minimal test case that demonstrates this?  I don't
> see anything on the bugtracker, so that may be useful as well.

Actually, I've just sent a patch with a small demonstration.  Is this
the same issue you're facing?  If not, could you add to that test.

It appears that the darcs2 format deals with this case correctly
(although I was surprised that a conflict got generated there... my
reading of the wiki led me to think that we would just have the
intervening change with no conflicts)

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9