tags:

views:

61

answers:

1

I get the error

svn: 'x' isn't in the same repository as 'y' "

during merge. What's the problem and how can I fix it ?

(I actually know the answer and posting it as soon as I am allowed by the system, so that it's googleable by others. I got my share of trouble finding the answer).

A: 

The problem lies in the fact the checkout information is different from what you specify in the svn merge command. Typically, it can be either:

  • the hostname is different when you did the checkout. You did the checkout as from svn.example.com but now you are merging by referring to an host alias, like svn-alias.example.com. note that even the case is important. You can get this error if you do svn merge from SVN.EXAMPLE.COM. More on this here and here.
  • you are specifying a username at svn merge in the form [email protected]. Try to remove the user@ specification (the user is passed anyway). svn considers the hostname, and thus the repo, different if you specify the user, even if the user is technically the same.
Stefano Borini