[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-08-30 23:20:39 CEST

On 8/30/07, Augie Fackler <durin42@gmail.com> wrote:

> The below is from a discussion with a fellow Adium developer (Peter
> Hosey, cc'ed on this message) who is using svn 1.5's interactive
> merging. He thinks (somewhat rightly, I suppose, given that svn's
> choices were intuitive to me from my p4 experience) that we should
> consider renaming the options in the merge resolution menu.
> His proposed solution is below. I'm not entirely sure it's perfect,
> but I think it might be less unclear than what we have now.

FWIW, I do not think that is any clearer.

In the transcript below there are at least two misconceptions:

1) He is using a WC path as his merge source. All Subversion does in
this case, is use that path to figure out the repository URL.
Disconnect from the network and try for yourself. In other words, a
merge is always coming from the repository.

2) You cannot do a URL <-> URL merge directly in the repository.

I guess our terminology is similar to Perforce, but I also think that
same terminology is used by most tools that do similar functions.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 30 23:17:46 2007

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