Create a branch to fix links on.
Try to set up svnmerge correctly.
Merge.
Merge.
Merge.
Merge.