svn - Erase a Subversion Branch -

svn - Erase a Subversion Branch -

i assigned merge few branches trunk in subversion. project setup following.

trunk branches brancha branchb branchc tags // bunch of tags (1 per release)

the goal integrate brancha , branchb trunk , have them "hidden" somehow.

i think know how actual merge. right click trunk in windows explorer , tortoisesvn > merge... reintegrate branch, take branch, merge.

question 1 - right method use?

i unsure repository after this. want create sure no future developers mistakenly work on old branches.

question 2 - branch unworkable after merge, or need else? can "delete" branch? if so, happen branch history? or need hacky apply locks branch?

thanks help.

question 1 - right method use?

yes, merge contents of branch working directory. nil happen repository until commit (newly merged) trunk. 1 time commit not trunk changes in repo, remember merged in branch.

question 2 - branch unworkable after merge, or need else?

at point can delete branch or can maintain making changes branch. if maintain making changes branch , later merge, new stuff (not stuff merged) merged trunk.

if want delete branch, easiest way i've found open repo browser, right-click on branch , select "delete". branch disappear latest version. still in repo history , can bring if necessary, doing fresh checkout not see it.

svn merge tortoisesvn branch