> The question for the developers is:  How can remote changes be falsely
> assumed to be local changes?

Is it possible that you did a darcs mv, and then changed your mind,
but used regular mv to move the files back?

Otherwise, darcs may have some issues with the pending patch.  David
keeps fixing pending-related bugs, so it may be something that was
already fixed between 1.1.0pre and 2.0.0, even with the old format.

Also, your case shows a place where darcs2 does not deal well with
conflicts on darcs1 repositories.  Maybe the new format does better.
We'd have to poke at it to find out.