10

Locally I've got TortoiseSVN version 1.6.11 installed.

This is using Subversion 1.6.13

My central SVN repository uses version SVN Server version 1.4.2 (and I can't upgrade it).

Every time I try to merge I get the message:

retrieval of mergeinfo unsupported by http://svn01.xxx.xxx.com/svn/

This is because the server uses an older version of SVN, which doesn't support mergeinfo, meaning my local version won't work.

So how can I merge?

Line
  • 1,529
  • 3
  • 18
  • 42
Ev.
  • 7,109
  • 14
  • 53
  • 87

1 Answers1

24

When merging, >=1.5, clients can do merge-tracking - basically find the revision when the last merge was done. Merge-tracking information is stored in the svn:mergeinfo property by the client when it performs a merge and once the merge is done, it is stored by the server. So when a new merge is done, the client expects to get this mergeinfo from the server.

In older servers, you have to explicitly mention the revision that you last merged ( or branched)

svn merge svn://server/repo/trunk@revision svn://server/repoo/branch .

Or use older client.

manojlds
  • 290,304
  • 63
  • 469
  • 417
  • 1
    Thanks a lot! Do you know what the equivalent GUI command is in TortoiseSVN? – Ev. Apr 20 '11 at 06:41
  • Works great, thanks! I'm using TortoiseSVN 1.5.8, SVN server 1.6.2. Tried to reintegrate a branch, and got the "retrieval of mergeinfo unsupported" message. Running command-line 'svn merge' with the last trunk-to-branch merge revision solved the issue. – george Jun 12 '12 at 07:03
  • 1
    It's worth noting that finding the revision is easier using Tortoise SVN's "Revision Graph" – Clement Herreman Mar 20 '13 at 11:30