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), and the meaning
of the 'local' term is ambiguous - does it refer to the state of the
working copy pre-merge or post-merge?
> I don't think you can really use any version control system (not just
> SVN but all others as well) if you don't understand those two terms.
>
> Do you have any suggestions on how that dialog could be improved?
> Just telling that it's not clear won't help at all.
yes, please read the paragraph you quoted from my last post, above.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855319
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-14 22:47:52 CEST