On Fri, Oct 14, 2011 at 16:47, spongman <piersh_at_gmail.com> wrote:
> On Oct 14, 1:31 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
>> > might it be possible to show, in the dialog, the path/URL/version of
>> > both the 'local' and 'repository' entries that conflicted? that
>> > would certainly go a long way to clarify which term refers to which
>> > entry.
>>
>> You've complained that the dialog is confusing. And that you're confused
>> about the difference between 'repository' and 'working copy'.
>> Those two terms are maybe the most important terms when you're using any
>> version control system. I'm sorry, but if you don't understand what a
>> repository and a working copy is and how they're connected, then I don't
>> see how we could make that dialog any easier to understand.
>
> I understand what those terms mean. However, when you're doing a merge
> there are two repositories involved (the repository you're merging,
> and the repository associated with the working copy),
Subversion does not support merging between two repositories, so
either your understanding or your terminology *is* wrong somewhere
along the way here.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855323
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-14 22:52:58 CEST