Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Why Merge-Tracking is disabled?

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Why Merge-Tracking is disabled?

Author steveking
Full name Stefan Küng
Date 2009-03-09 13:38:16 PDT
Message 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/repo​1/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.

Stefan

--
       ___
  oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
   \ \_/_\_/> The coolest Interface to (Sub)Version Control
   /_/ \_\ http://tortoisesvn.net
Attachments

« Previous message in topic | 3 of 5 | Next message in topic »

Messages

Show all messages in topic

Why Merge-Tracking is disabled? hahoyer Harald Hoyer 2009-03-09 11:41:42 PDT
     Re: Why Merge-Tracking is disabled? levyam Andy Levy 2009-03-09 13:05:43 PDT
     Re: Why Merge-Tracking is disabled? steveking Stefan Küng 2009-03-09 13:38:16 PDT
         Re: Why Merge-Tracking is disabled? leak Kurt Pruenner 2009-03-09 14:11:59 PDT
     Re: Why Merge-Tracking is disabled? neves Paulo Eduardo Neves 2009-03-10 12:23:42 PDT
Messages per page: