[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Conflict Resolution UI

From: Peter Hosey <boredzo_at_gmail.com>
Date: 2007-08-31 00:22:19 CEST

On Aug 30, 2007, at 14:20:39, Mark Phippard wrote:
> All Subversion does in this case, is use that path to figure out
> the repository URL. … In other words, a merge is always coming
> from the repository.

Right; I mentioned that in my email. (Where else would previous
revisions come from? Obviously, they must come from the server.) Part of
that is that I know the *destination* is the local WC, so with two WC
paths in the command line, it comes off as a plain WC-to-WC merge to me.
I just didn't think about that aspect deeply enough at the time.

That part is not your fault, though. I don't think there's anything you
can do about a user (me) failing to think deeper than the convenience
feature of specifying relative paths in the WC, and that's *part* of
what caused a problem for me. Consider it a UI victory that you hid the
implementation detail so well. ☺

The main ambiguity for me was that it just says “the repository”,
without any indication of *where* in the repository. It wasn't obvious
whether it was talking about the source directory in the repository,
or the destination directory in the repository. I only figured it out
while writing my previous email (the one that Augie forwarded to you).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 31 00:19:32 2007

This is an archived mail posted to the Subversion Dev mailing list.