[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 James <james_at_cs.toronto.edu>
Date: 2007-12-03 17:32:14 CET

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 .

Cheers,

David

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 3 17:32:30 2007

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