Hmm,
This sounds like a conflict-resolution problem with unrecorded changes. I have
not looked too deeply into this, but I'll note that you can pull the changes
without the unrecorded changes.
One intervention you could take is to save your work by doing
darcs record
darcs send -O
This gives you a bundle with your unrecorded changes. If you try to apply them
to the repository (with that first patch) pulled, you'll notice that darcs
appears to hang too. But perhaps you could 'rewrite' the patch in a simpler way?
The nature of the patches is interesting. They contain something like
move A -> B
rm B
add A
Did you intend to 'swap' two pre-existing files, A and B? |