On 09.12.2014 09:46, Simon Large wrote:
> On 9 December 2014 at 08:11, Martin Helgesen <martin.brusevold_at_gmail.com> wrote:
>> Well, this was awkward. If you do a merge and the URL to merge from has a casing in the URL than your working copy's checkout URL, the merge will perform, but no mergeinfo is recorded.
>>
>> I have many developers in my team who has merged a bunch of revisions and mergeinfo is now corrupt.
>>
>> Example: Checked out trunk from http://****/svn:8080/repo/trunk Try to merge from url http://****/svn:8080/Repo/branches/****
>>
>> This will do the merge, but not record mergeinfo
>>
>> Another example: Checked out trunk from file://****/subversion/repo/trunk Try to merge from url file://****/Subversion/repo/branches/****
>>
>> This will do the merge, but not record mergeinfo
>>
>> This must be a bug in tortoiseSVN?
>> Or is this by-design? It cannot be?
>
>
> Much more likely that this is a bug in the subversion library, in
> which case you would need to report it on the subversion users mailing
> list. The way to prove that would be to do the same thing with the
> command line client. I am almost sure I have heard it reported before
> but can't find it now.
That issue is well known.
The root problem here is that svn is case-insensitive, which includes
urls. However, if the svn repository is served via a Windows Apache
instance, that treats urls as case-insensitive and accessing it with the
wrong case therefore works. So the merge data is received properly by
the client. But then later when the merge info is to be applied, the url
comparison fails (because it is done case-insensitive) and the merge
info is not applied because it doesn't match.
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=3092482
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-09 22:15:48 CET