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

Re: Auto-selection of merge source URL

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-30 19:41:15 CET

On Nov 30, 2007 10:38 AM, C. Michael Pilato <cmpilato@collab.net> wrote:
> Daniel Rall wrote:
> > Mike, sorry if I'm being dense here, but I don't really follow this
> > change. svn_client_suggest_merge_sources() is intended to (when
> > possible) automatically select the correct merge source URL for a
> > target. Removing its usage means that the user will either have to
> > manually enter a URL.
> >
> > However, your commit log suggests that you've made the merge source
> > the same as the target, which makes no sense to me.
> The problem with defaulting to the copy-from source is that this case:
> svn merge -c -SOME_REV
> will try to undo a change made on the copy-from source, not a change made on
> the target. But clearly, the user expectation for such an invocation is the
> latter.

How bad of an idea is making "svn merge" with reverse ranges default
to the target and with forward ranges default to the other branch?

In my mind that would match common uses well, though maybe it is too
clever, and if the command can take multiple ranges (can it?) clearly
doesn't work.


David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 19:41:26 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.