> But darcs has an incredibly steep performance drop-off.
Yes. A darcs merge typically either terminates in seconds, or never
terminates.
> Even though I added '--verbose' flag, the last time it displayed
> anything was "diffing dir..." about 8.5 hours ago.
Sorry, you're in trouble. The only solution is to do a manual merge.
Go to the source repository, do
darcs diff -u --patch='the patch I cannot merge' > silly.patch
and then in the target repository, do
patch -p1 < .../silly.patch
check all rejects, and then do a record.
>From that point, you'll have to do manual merges for any files touched
by that patch, unfortunately. I've been thinking about better
workarounds, but they're tricky.
Juliusz
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
