Re: resolve conflict dialog is confusing

On 14.10.2011 23:32, spongman wrote:
> On Oct 14, 2:26 pm, Stefan Küng<tortoise..._at_gmail.com> wrote:
>> On 14.10.2011 23:23, spongman wrote:
>>
>>> On Oct 14, 2:11 pm, Stefan Küng<tortoise..._at_gmail.com> wrote:
>>>> I think you're confusing something here. Unlike DVCS, Subversion does
>>>> not have a local repository.
>>
>>> yeah, i understand that. but the working copy has a repository, right?
>>
>> Quote:
>> Unlike DVCS, Subversion does
>> not have a local repository.
>>
>> The working copy does not have a repository. It only knows where the
>> repository is (it knows the url of the repository to which it can
>> connect to).
>
> yeah, that's what I mean by 'has a repository'.

And that's the same repository you're merging from. So there are no two
repositories, only one.

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