> I don't think the @ is the reason for
> the errors you get.
> I have myself never used svn merge because it used to be
> very slow.
> Brian said to use it now, so we should ...
Sorry, I didn't mean to make a new rule. I'm just used to using svn merge. If you're having trouble using svn merge, then making the changes manually is better than not moving them over at all.
The most important thing is to keep the two branches in sync with respect to bug fixes.