Simon,
Both bugs 190 and 191 are a problem with commuting mergers.
As you doubtless know, Darcs works by commuting patches around. While
we do believe that the commutation rules that Darcs uses are correct,
we have no proof of that fact. What is more, we do know that they are
not complete -- commutation does fail in some cases.
What you see is commutation failing. While this is a bug, it is not
critical: nothing has been corrupted, but the merge cannot complete.
I have encountered this situation exactly twice in two years' working
with Darcs. I solved the problem once by doing a manual merge (darcs diff
followed with patch), and once by manually hacking a repository. Both
solutions are suboptimal, for various reasons, I recommend the first
one as being simpler.
I may be wrong, but I fear that the only person competent to fix this
problem is David. I wouldn't hold my breath -- I recommend going
ahead and doing a manual merge.
Juliusz
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
