[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Why Merge-Tracking is disabled?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 09 Mar 2009 20:13:33 +0100

Harald Hoyer wrote:
> Merged two branches, but merge tracking did not work. Couldn't find any
> reason.
> After desperate efforts I more or less accidentially used the "Only
> record the merge"-option. Now I could see an error message: "Merge from
> foreign repository is not compatible with mergeinfo modification". And
> the reason of the trouble was: on checkout I used a different case to
> specify the svn-server-name (example: "svn://MyServer/repo1/trunc" and
> "svn://Myserver/repo1/branch/v11").
> First wish: It should be easier to find out, why merge tracking did not
> work.

You'd have to ask for such a feature on the Subversion mailing list.

> Second wish: At least the server name part should not be considered as
> case sensitive.

AFAIK, urls are case sensitive according to standards. It's up to the
server to allow case insentivie paths or not, but clients have to treat
urls as case sensitive.
And again, if you with to have this changed you have to ask on the
Subversion mailing list.

> Third wish: To avoid a messy and disturbing situation, it should be
> possibe to protect against merges without merge tracking.

There's a hook script in the Subversion contrib folder which rejects
connection from clients that are not able to handle merge tracking.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-03-09 21:38:25 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.