@garthk yeah, svnmerge.py is basically built into Team System branching/merging. I guess I didn't appreciate how much it sucked in SVN.