[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: Tom von Alten <tom.vonalten_at_gmail.com>
Date: Wed, 1 Sep 2010 12:14:41 -0700 (PDT)

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?

I just stumbled into exactly the same questions about the meaning of
the terms in this dialog.

Dave Huang replied:
> 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...

I take that as an answer for the "Merge a range of revisions"
interface,
"Repository" means the one and only one Repository I pointed to
explicitly,
just ignore the fact that my action is on a working copy of something
that
points to a different repository.

> (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 the case of conflicts between those 2 source URLs, how does a
single
button labeled "Use Repository" specify how to resolve a conflict?

> 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.

Searching for "tortoisesvn resolve conflict dialog" led me to the help
file
page titled "Resolving conflicts", in which "Use local" and "Use
repository"
are not mentioned, nor the conflict dialog illustrated. Oddly.

At the bottom of the "Merging" help file, there's a section "Handling
Conflicts during Merge" which does show the conflict dialog and its
buttons,
and suggests the answer I've inferred, but does not come right out and
say
WHICH REPOSITORY, even though the "Merging" page covers the whole
gamut of
methods.

I agree with spongman. If the dialog could provide a simple
disambiguation,
it would be good. And further, I think the documentation should be
enhanced
with "See also" hyperlinks, at least.

Take my observation for what it's worth, as someone quite new (and
struggling for several days now) with the business of merging with
TortoiseSVN.
There's no review resource like the innocent newcomer, eh?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-01 21:15:18 CEST

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