Am 30.04.2013 20:07, schrieb Ben Fritz:
> On Tue, Apr 30, 2013 at 12:58 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>>>
>>> Server: version 1.5.6
>>
>> And that's the main reason: your server is way too old and doesn't
>> support merge tracking. If you had a newer server (>= 1.6), the second
>> merge would succeed since svn would know that one of the revisions you
>> selected for the merge was already merged and it would not try to merge
>> that revision again.
>>
>
> I'm confused. Isn't the merge done by the client, not the server?
While the merge is done in the client (so having a 1.7 client really
helps with merging) the repository layout must provide the required
"slots" to store the merge tracking info and to efficiently retrieve it
while merging.
However, if I recall correctly, the required functionality has been
added to the 1.5 server version already, not 1.6.
But, that also means if you have upgraded your server from 1.4 or
earlier to 1.5, but never run "svnadmin upgrade" on your repositories,
your repositories will not have the required slots to store the
mergeinfo, so merge tracking will not magically work even if you
upgraded your server to 1.7. You will have to find a time where you can
live with the repository being unavailable for committing for some time
(depending on the size of your repository) and run the upgrade command
to re-build your repository structure(s) with all the new features
enabled. Or you can also dump and reload the repository if you are more
comfortable with that approach or if you do repository dumps for backup
purposes regularly anyway.
Hope that helps,
Michael
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3054663
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-04-30 20:33:13 CEST