On Aug 19 2010, 12:08 pm, Dave Huang <k..._at_azeotrope.org> wrote:
> On 8/19/2010 1:59 PM, spongman wrote:
> >
> > the term 'repository' is ambiguous since both branches are in the
> > repository, and this button does not disambiguate between them.
>
> > the term 'local' sin't much better - does it refer to my working copy
> > before the merge, the working copy after the failed merge, some other
> > local copy?
>
> Merges aren't done on branches in the repository though--they're done
> between a working copy and the repository. When you do a merge, you
> generally only specify a single repository URL (the exception being the
> "merge two different trees" option, but in that case, both repo URLs
> define the "source" of the merge; you're still merging into your working
> copy).
>
> In any case, I don't think the documentation for the conflict resolution
> process needs to be on the window; the terms are clear enough if you
> read the TSVN help file.
ok, it's been a year. i've read this thread, i've read the docs.
I know it's all explained in the help file and if you're intimately
familiar with the inner workings of the SVN codebase it's probably as
clear as day, but every time this dialog appears I still find it
ambiguous.
It could be that I'm just an idiot. However, i don't seem to be the
only one that has this problem.
Above you state that a merge is done between a "working copy and the
repository", but isn't a working copy always associated with a
repository (making the 'repository' term ambiguous)? if not, is that a
common use-case? is it a common enough use-case that knowledge of it
precludes understanding of a core user-interface element?
Please ask yourself: "should the user interface only make sense to
people who have read (or wrote) the help file?"
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855268
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-14 20:33:00 CEST