Create a branch to fix links on.
Try to set up svnmerge correctly.
Another try. Turns out I had the wrong source branch.
Merge from trunk.
Merge from trunk.
Merge.
Merge.
Merge.
Merge.