Re: resolve conflict dialog is confusing

On 19.10.2011 20:41, spongman wrote:
> On Oct 19, 11:13 am, Stefan Küng<tortoise..._at_gmail.com> wrote:
>> ... it has nothing to do with the merge.
>
> really? surely the existence of the target working copy depends on
> this association. you cannot have a working copy without it, right? As
> far as I know (and I defer to you as the expert here) the link to/
> association with the repository is part of what defines what a working
> copy is. From the point of view of the user you're merging one branch
> into another, both are associated with the repository and therefore
> the term 'repository' could refer to either one.

Yes, a working copy is associated with a repository. And a working copy
is the target of a merge operation. But again (and hopefully for the
last time): the associated repository of the target working copy has
nothing to do with the merge.
I repeat: the associated repository of the target working copy has
nothing to do with the merge.

Also, if we refer to a repository, we would mention 'repository' and not
'working copy'. But we always mention 'working copy'. So why do you
insist that a working copy and its repository are ambiguous?
In TSVN (and the SVN docs and CL client as well), there is not one
mention of 'working copy' where a repository is meant or vice versa.

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