CODEWITHSUNDEEP
svnmergetortoisesvn
SARAVAN
SARAVAN

Reputation: 15031

SVN Merge issue .. is not the same repository as

I am working in a .net project and clients use SVN as source control. Currently we have a trunk version of the code which is in svn://svnserver.com/Code/Trunk and a branch is also present which is svn://svnserver.com/Code/Branches/Myteam. We are downloading the code from branch and working in our local machine and committing code changes in the branch

Now I wanted to merge the code changes from branch to trunk. When I started merging from BRANCH to TRUNK, I get the following error

svn://svnserver.com/Code/Trunk is not the same error as svn://svnserver

I don't know what's going wrong. But I am new to using SVN so I am not sure how to get rid of this error.

For both TRUNK and BRANCH, I have mapped my local folder correctly and the code is downloaded without any issues.

But only merging is becoming a problem. Do I need to do any settings in SVN? Any help wpuld be appreciated?

Upvotes: 2

Views: 6325

Answers (1)

M4N
M4N

Reputation: 96551

You have to make sure that you always access your SVN server using the exact same URL. Even if your SVN server is accessible using either svn://server/repos or svn://server.company.com/repos you have to make sure that you use the same URL for both branches.

If you have a working copy where you want to change/correct the URL of the server, then you can use the "TortoiseSVN->Relocate..." command to do so.

Upvotes: 2

Related Questions