Question

I have \trunk\root\ which contains folders ProjectA, ProjectB etc.
I have creates branch of root -> \branches\task\root\

Now I’ve made considerable changes to the projects in task including ProjectB.

However \trunk\root\ProjectB has also moved on to a point that makes all the changes in task\Root\ProjectB redundant.

I would like to completely replace the content of \branches\task\root\ProjectB with the content of \trunk\root\ProjectB. No merging just make the task version ProjectB identical to the trunk version. Note when it comes to merging task back into trunk I don’t want any weirdness happening in ProjectB, SVN should just see that its an old version of what is now in ProjectB and not change anything in it.

Can anyone guide an SVN know-nothing like me (who also happens to be a complete CLI whimp) through using TortoiseSVN to acheive this?

Answer 1

1. Delete the current ProjectB on the branch, do this on the svn repo
2. Copy the trunk ProjectB onto that branch location again (where ProjectB used to be).
3. Revert, or better still, recheckout ProjectB.

That is if you’re okay with losing the history.

An alternative approach where the history will be kept – but this will use the Eclipse IDE

1. Checkout ProjectB from trunk
2. Checkout ProjectB from branch (to a different project in Eclipse)
3. Compare the two versions of ProjectB and bring in all the changes from the Trunk Project B into branch ProjectB
4. Checkin Branch Project B