Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to merge with SVN server prior to 1.5 (retrieval of mergeinfo unsupported)?

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?

like image 477
Ev. Avatar asked Apr 18 '11 03:04

Ev.


People also ask

How do I merge two svn revisions?

If you want to merge changes into a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using TortoiseSVN → Merge.... In general it is a good idea to perform a merge into an unmodified working copy.


1 Answers

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.

like image 138
manojlds Avatar answered Oct 14 '22 07:10

manojlds