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

Re: Add -c option to merge

From: Michael Sinz <Michael.Sinz_at_sinz.org>
Date: 2005-10-27 12:15:27 CEST

Daniel L. Rall wrote:
> On Thu, 27 Oct 2005, Greg Hudson wrote:
> ...
>>>Though I'm usually the one to rear the head of the backwards compatibility
>>>monster, in this particular case my personal preference is strongly on the
>>>side of completely changing the semantics of this command to the more
>>>intuitive behavior being suggested for the -c flag. This behavior is so
>>>intuitive that it's what 'svn log -r 37' already does (!)
>>"svn log -r 37" is not equivalent to "svn log -r 36:37", which is what
>>the proposed meaning of "-c 37" is.
> You're thinking about Subversion's specific implementation details, while
> I'm referring to the user interface.

I think he was refering to the human behaviors that we have. "svn diff"
has a different meaning to most of us than "svn merge" and maybe "svn log"
Usually "svn diff" is used while within a WC and is intended to diff against
the current working version of the local file and not between two versions
in the repository. When the latter is needed, a more complete syntax is
understood to be needed (-r 36:37 or simular)

> "diff -c" says "give me change 37", and "log -r" says, "give me the log
> for change 37". Which is why the fact that "diff -r" does something
> inconsistent -- by implicitly creating set of N changes -- so rubs me the
> wrong way.

I guess you don't use the command line much in WC while developing. The
"svn diff -r 37" syntax is the most natural way to say "I want to see what
I have changed since revision 37"

This is much like "svn up -r 37" which then gets you that revision of the
file/directory/wc (depending on the other arguments)

Now, most of the time, I just use "svn diff" or "svn diff <filename>" since
I really only care about differences to last commit but that is not always true.

Having a "svn diff -c 37" would feel just as good as a "svn merge -c 37" does.
In fact, generally, the -c/--changes syntax is handy in such commands.
(just don't add to the confusion by having "svn up/switch/etc" accept it)

Michael Sinz                     Technology and Engineering Director/Consultant
"Starting Startups"                                mailto:michael.sinz@sinz.org
My place on the web                            http://www.sinz.org/Michael.Sinz
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 12:19:52 2005

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.