[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: David Huang <khym_at_azeotrope.org>
Date: Wed, 1 Sep 2010 17:07:17 -0500

On Sep 1, 2010, at 4:20 PM, Tom von Alten wrote:
> 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.

You're merging the *changes* between two revisions, not merging the two revisions themselves. "Use repository" means to go ahead and take those changes, even if they conflict with changes you have in your local working copy. And conversely, "Use local" means to use the changes you made in your local working copy, rather than the changes from the repository.

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

Right, there are two source URLs, but they're both in the same repository. As I mentioned earlier (and tested empirically), Subversion requires that both URLs be in the same repo. So just like the case mentioned earlier, you're merging the changes between two revisions in the one repository. "Use repository" is unambiguous--there aren't two repositories to choose from. There's just the one repository, and the one working copy.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 00:07:33 CEST

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