Re: Conflict with merge

On 30.04.2013 20:07, Ben Fritz wrote:
> 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?

actually, both server and client are part of the merge and the merge
tracking.
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword

-- 
        ___
   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=3054661
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].