This is bad, but there is probably not much we can do about it. The
patches that make up your two repositories violate a certain global
invariant. This is usually caused by bugs in the darcs-1 or darcs-2
patch formats. An unfortunate side-effect of some refactors we made
since 2.16 is that darcs is now more likely to "notice" violation of
such invariants. In such a case there is really nothing we can do other
than crashing.
However, there are things you can do to mitigate the situation.
My guess is that the repo you are pulling from ("REPOS") either has
unresolved conflicts, in which case it may help to resolve these
conflicts first. Otherwise, i.e. if the conflict is with patches in the
repo into which you pull, you could try `darcs rebase pull`. This
suspends any local patches that conflict. You can then `darcs rebase
unsuspend` them one at a time, resolve the conflicts, and `darcs amend`
those resolutions into the patch. (This works somewhat similar to `git
pull --rebase`, in case you happen to be familiar with that.)
|
