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

Re: 'svn merge -rX' UI annoyance.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-08-05 15:33:01 CEST

On Aug 4, 2005, at 12:20 PM, kfogel@collab.net wrote:
> The advantage of -r:X is that it allows us to make the same behavior
> for diff and merge, which are two commands we've been trying to keep
> consistent.

I've heard both kfogel and ghudson say that they think 'diff' and
'merge' should behave consistently, but I think this is a potentially
dangerous goal.

The diff command has three distinct abilities:

    * compare working to text-base
    * compare working to repository
    * compare repository to repository.

Of these three use-cases, *only* the third one is similar to 'svn

We've gone through hell trying to come up with an understandable 'svn
diff' syntax that covers the three use-cases. I'm wary of starting
to tweak 'svn diff' syntax just so that the 3rd use-case behaves in
special ways that make it behave more like 'svn merge'. 'svn diff'
syntax already complex, bordering on confusing.

I guess I'm not entirely clear on what's being proposed, though. It
sounds like people are asking for 'svn merge [some new syntax of X]
URL' to mean "merge revision X-1:X of URL". I'm afraid that if we
introduce the new syntax to 'svn diff', it will have to somehow be
restricted to *only* the affect 3rd use-case, and done in such a way
so as not to interfere with the other two use-cases. Is this really
possible? Is it worth treading there?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 5 15:33:53 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.