[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 19:02:50 CEST

On Aug 5, 2005, at 11:45 AM, Julian Foad wrote:

> Ben Collins-Sussman wrote:
>
>> 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.
>>
>
> That's not an accurate categorisation of "svn diff"'s abilities.
> For example, it can also compare text-base to repository ("diff -
> rBASE:23 WC-PATH") and working to working ("diff --old=WC1 --
> new=WC2").

Yep, --old and --new seem to allow a whole bunch of possibilities.
But if you actually try anything beyond those three cases above,
you'll get an 'unsupported' error. They're the only codepaths that
exist, I'm pretty sure.

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