SVN - merging is not merging

Question

I am kind new to the SVN and I am having a problem.

We have the branch/Project1 .

We need to add complete redesign to the Project1. So after some time, Project1 will be abandoned. But during the new code implementation, we still need to maintain it.

So, I have created tag/Project1NEW from branch Project1.

All of the new development will be done in Project1NEW, and bug fixing will be done in Project1. Of course, those bugs needs to be merged in Project1NEW.

My problem is that I am not seeing my merges from the Project1 to Project1NEW .

Using Tortoise , this is what I have done:

1. Switched to tag/Project1NEW
2. Selected Merge
3. Selected revision that I want to merge
4. Clicked ok

Tortoise did whatever it needed to do, without error. I got the merge done message. But I do not see my new code, mainly bug fixes. What is strange, if I selected to merge again, the previously merged revision is now greyed (saying already merged).

I know, I most likely did the wrong thing :(, but now is kinda to late. How can I fix my problem?

Ideally I would like to select the merge, and have it merged to my *tag .

Answer 1

You should not create a tag in this case. You should've created a feature branch and use basic merging to merge both branches. Read how merging works in SVNBook and you should be able to solve the issue.