Merging and branching in Subversion 1.5