[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-12-03 18:49:38 CET

On Dec 3, 2007 8:32 AM, David James <james@cs.toronto.edu> wrote:
> On Nov 30, 2007 11:02 AM, C. Michael Pilato <cmpilato@collab.net> wrote:
> > Vlad Georgescu wrote:
> > > David Glasser wrote:
> > >> 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?
> > >
> > > +1. That would minimize the number of URLs you need to type.
> >
> > Here again, though:
> >
> > $ svn merge -c -SOME_REV
> >
> > Oh! Shoot! Better undo that:
> >
> > $ svn merge -c SOME_REV
> >
> > Uh...
>
> This is a very good point, Mike. I think you are right that the 'copy
> source' default is confusing; further it would be even more confusing
> to have the default change on you based on the direction of the merge.
> Still, if we are going to have a default, the "default to the target"
> behavior is not very useful, because it simply saves you from typing
> "." when you are reverting changes.
>
> Maybe we should get rid of the default altogether (ala SVN 1.4), and
> just make it easier to type the URLs? Troy Curtis Jr is already
> working on a patch which converts "^" into the repository root. See
> http://svn.haxx.se/dev/archive-2007-11/0276.shtml
>
> Copying changes from trunk, and then undoing your work:
> svn merge -c SOME_REV ^/trunk
> svn merge -c -SOME_REV ^/trunk
>
> Reverting a change, and then putting it back:
> svn merge -c -SOME_REV .
> svn merge -c SOME_REV .

The irony here, of course, is that 99% of the time it is entirely
unambiguous to a human what is meant, at least if we're just talking
about a single revision and not a large range. Most of the time, if I
type

  svn merge -c 999

revision 999 probably only has changes in /trunk or /branches/foo or
/branches/bar, not in all of those. While I certainly understand why
our model makes it inappropriate to just recognize that and "do the
right thing", it is sadly the case that (at least for the
single-revision case) there really is generally a "right answer" that
any human could figure out from log -v...

--dave

-- 
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 Mon Dec 3 18:49:52 2007

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