Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'?

I am trying to merge a Branch to Trunk using the TSVN 'Reintegrate a branch' featur开发者_如何学Pythone. However I get the following error.

Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'?

What is the reason for this error? Also is there some other way to merge the Branch to the Trunk.

---

Maybe the SVN server you're referring to is of a version prior to 1.5? Or the repository hasn't been updated after updating the server itself?

svn:mergeinfo is used by the merge tracking feature to keep track of which revisions have been merged WRT a file or a directory.

The error message you get seems to indicate a mismatch between your client's svn version and the version installed on the server.

Not sure about your second question. TortoiseSVN itself gives you 3 different possibilities: merge a range of revisions, reintegrate a branch and (I may be wrong here, I'm on Mac right now) merge two different trees.

You should probabily refer to the svnbook to really understand the difference between

svn merge

and

svn merge --reintegrate

---

If you are on IntelliJ 13.1 (Build #IU-135.475) and having this problem and your server is not 1.7x yet simply go to your Subversion preferences, presentation tab, un-tick 'Show merge source in history and annotations'.

SVN: Branch and reintegrate is not working with updated server

---

Check for server software version (svnadmin, svnserv or mod_dav_svn.so). Upgrade to any >= 1.5.

Next upgrade repository (take few seconds):

$ svnadmin upgrade REPOS_PATH

If you worry or have no remote access for converting - dump or sync repository copy by:

$ svnsync initialize --username=XXX --password=YYY $MIRROR $MASTER
$ svnsync synchronize $MASTER

or:

 $ svnadmin dump $MASTER  > svn.dump

That's all!