Question

I have a /Trunk in my Project X. On rev 69 we had to revert changes in three earlier revisions (61,63,64).

What I did was a reverse merge on the revisions 61,63,64 and committed this to rev 69. Then we could deploy again and everyone was happy.

Now we have learned that developing new features in a separate branch is a neat idea, and then the Trunk is always ready to deploy to production (and doing hotfixes on current release).

So now I have made a “/Branches/X”(rev 70) from the HEAD revision in the /Trunk (which is rev 69), but I want to have with me the changes I undid in the /Trunk (61,63,64)

What is the correct way to this?

btw, have I made meself clear about? 🙂

Answer 1

First of all, watch your spell-checker: trunk and branches are conventionally all lower-case. That said, you should remove your branch and recreate it from revision 68.

svn delete <project_url>/branches/X -m"branch X removed"

svn copy <project_url>/trunk@68 project_url/branches/X -m"New branch X"

Here I’m assuming that revision 68 contains all changes from revs. 61,63,64 and nothing you do not want.

I’m sure you already realized that you can’t go far without the Subversion book.