[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: resolve conflict dialog is confusing

From: spongman <piersh_at_gmail.com>
Date: Wed, 19 Oct 2011 11:41:32 -0700 (PDT)

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.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2858903

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-19 20:42:06 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.