Why Merge-Tracking is disabled?

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Why Merge-Tracking is disabled?

Harald Hoyer
Why Merge-Tracking is disabled?

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.
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.

Reply | Threaded
Open this post in threaded view
|

Re: Why Merge-Tracking is disabled?

Stefan Küng
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.

Stefan

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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1298762

To unsubscribe from this discussion, e-mail: [[hidden email]].

signature.asc (202 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Why Merge-Tracking is disabled?

Andy Levy
In reply to this post by Harald Hoyer
On Mon, Mar 9, 2009 at 14:41, Harald Hoyer <[hidden email]> 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.

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.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1298650

To unsubscribe from this discussion, e-mail: [[hidden email]].
Reply | Threaded
Open this post in threaded view
|

Re: Why Merge-Tracking is disabled?

Kurt Pruenner
In reply to this post by Stefan Küng
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.org/html/rfc1034#section-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)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1298905

To unsubscribe from this discussion, e-mail: [[hidden email]].
Reply | Threaded
Open this post in threaded view
|

Re: Why Merge-Tracking is disabled?

Paulo Eduardo Neves-3
In reply to this post by Harald Hoyer
On Mar 9, 3:41 pm, Harald Hoyer <[hidden email]> 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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1304437

To unsubscribe from this discussion, e-mail: [[hidden email]].