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

Re: svn commit: r25113 - in trunk/subversion: svn tests/cmdline

From: David James <james_at_cs.toronto.edu>
Date: 2007-05-25 02:30:08 CEST

On 5/24/07, Daniel Rall <dlr@collab.net> wrote:
> On Thu, 24 May 2007, David Glasser wrote:
>
> > On 5/22/07, dlr@tigris.org <dlr@tigris.org> wrote:
> > >Log:
> > >Exchange the more specific --suggested-source option introduced in
> > >r25112 for the --merge-sensitive/-g option (cherry picked out of the
> > >merge-sensitive-log branch), as requested by epg on IRC.
> >
> > I think using --merge-sensitive here is pretty confusing. Unless I'm
> > mistaken, you're suggesting:
> >
> > $ svn merge --merge-sensitive
> >
> > as a command people would be typing? I know getting the short option
> > (-g) is nice, but if I saw --merge-sensitive as an option in "svn help
> > merge" my first thought would be "as opposed to what?
> > merge-insensitive merges?"
>
> The --merge-sensitive option really represents "merge info sensitive".
> So, the answer to your question would be "yes, as opposed to merge
> info-insensitive merges."
>
> --mergeinfo-sensitive is even more of a mouthful than
> --merge-sensitive. Have a better naming suggestion?

I know this is a bikeshed, but, how about "--merge-smart"? This flag
makes the merge command smarter -- it teaches the merge command to
look at your merge history and figure out what revisions to merge.
Without this flag, the merge command acts dumb and doesn't guess.

This flag name could work for "svn info" and "svn log" as well.

Cheers,

David

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 25 02:30:24 2007

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