[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 14:20:34 -0700 (PDT)

David Huang wrote:
> I'm not sure what you mean by "my action is on a working copy of
> something that points to a different repository." You can't merge
> between two repositories. The merge source is the repository, the
> merge destination is your local working copy, which was created
> from that same repository.

Sorry I don't have the terminology in hand, reading your response
suggests I meant "two revisions in the repository." I'm merging
changes contained in a branch to a working copy of the trunk.

The ambiguity is which of two versions in the repository that "use
repository" refers to. For a mod of a working copy of the trunk,
using changes contained in a branch in the repository, it (now, thank
you) seems clear enough that Tortoise refers to the branch version in
the repository.

> Not sure what you mean by "conflicts between those 2 source URLs".

If you're merging two trees, there are two source URLs, and two
versions in the repository at issue. Does it offer the choice to "Use
repository" for that, and if so, which one does it refer to?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-01 23:54:06 CEST

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