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

Hide all messages in topic

All messages in topic

Re: Why Merge-Tracking is disabled?

Author neves
Full name Paulo Eduardo Neves
Date 2009-03-10 12:23:42 PDT
Message On Mar 9, 3:41 pm, Harald Hoyer <haho...@t-online.de> 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".

I had a similar problem that was hard to discover why.

My work copy was referencing the repository http://localmachine/svn
and the merge was comming from http://localmachine.​my.domain/svn

Re: Why Merge-Tracking is disabled?

Author leak
Full name Kurt Pruenner
Date 2009-03-09 14:11:59 PDT
Message Stefan Küng wrote:
> 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.

http://tools.ietf.or​g/html/rfc1034#secti​on-3.5

| Note that while upper and lower case letters are allowed in domain
| names, no significance is attached to the case. That is, two names with
| the same spelling but different case are to be treated as if identical.

--
Kurt Bernhard Pruenner --- Haendelstrasse 17 --- 4020 Linz --- Austria
.......It might be written "Mindfuck", but it's spelt "L-A-I-N".......
np: Mr. Scruff - Hold On (with Andreya Triana) (Ninja Tuna)

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

Re: Why Merge-Tracking is disabled?

Author levyam
Full name Andy Levy
Date 2009-03-09 13:05:43 PDT
Message On Mon, Mar 9, 2009 at 14:41, Harald Hoyer <hahoyer at t-online dot de> 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.

Merging between repositories doesn't work (or isn't supposed to). I
believe this is already documented. Subversion thought you were going
between repositories.

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

Subversion is case-sensitive everywhere. You'd have to take this issue
up 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.

Messy in what way? I suspect this would go back to the SVN libraries as well.

Why Merge-Tracking is disabled?

Author hahoyer
Full name Harald Hoyer
Date 2009-03-09 11:41:42 PDT
Message 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.
Second wish: At least the server name part should not be considered as case
sensitive.
Third wish: To avoid a messy and disturbing situation, it should be possibe
to protect against merges without merge tracking.
Attachments
Messages per page: