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

RE: Resolution of 'svn diff' change?

From: Sander Striker <striker_at_apache.org>
Date: 2003-05-20 20:39:58 CEST

> From: Greg Hudson [mailto:ghudson@MIT.EDU]
> Sent: Tuesday, May 20, 2003 8:25 PM

> On Tue, 2003-05-20 at 13:52, Sander Striker wrote:
> > Say that some file is called 'C' in my working copy. It was called 'B'
> > in revision N and 'A' in revision M. Now, what would this do:
> >
> > svn diff --old=URL-OF-WC@M --new=URL-OF-WC@N A

I had meant to say: svn diff --old=URL-OF-WC@M --new=URL-OF-WC@N C
Where C is the file as currently in my working copy. Note that the
shorthand of this makes the problem a bit clearer:

  svn diff -r M:N C

> I had proposed that paths are relative to new-target. Here is a usage
> message, adapted from Jan's, with a special case to preserve "svn diff
> -r N:M URL" as requested by Phillip. (I admit, that blows a hole in my
> "with no corner cases" assertion. But it's just a convenient shorthand
> for the normal use case. Another option would be to make an option
> which sets both OLD-TARGET and NEW-TARGET, which would allow for "svn
> diff -r N[:M] --fabledoption=TARGET path1 path2 ...". That really gets
> back into bikeshed-painting territory, though.)
>
> ---
> diff (di): display the differences between two paths[1].
> usage: 1. svn diff [-r N[:M]] [--old=OLD-TARGET] [--new=NEW-TARGET] [PATH ...]
> 2. svn diff -r N[:M] URL
>
> 1. Displays the differences between OLD-TARGET and NEW-TARGET. If
> PATHs are given, displays only differences in those paths, relative
> to NEW-TARGET. OLD-TARGET and NEW-TARGET may be local wc path or
> URL[@REV]. OLD-TARGET defaults to "BASE", NEW-TARGET to .
>
> '-r N' sets revision of OLD-TARGET to N. '-r N:M' also sets
> revision of NEW-TARGET to M.
>
> 2. Shorthand for 'svn diff -r N[:M] --old=URL --new=URL'.
>
> Use just 'svn diff' to display the local modifications in your wc.
> ---

So would my above example give me the diff between B@N and A@M, or would
it try to do a diff between C@N and ... ?

> Does anyone else want to have a crack at implementing this? I feel like
> my implementation effort would be better spent fixing bogons in ra_svn
> (and making all the backward-incompatible changes while the user base is
> still relatively low). If we can all agree on a syntax but no one wants
> to implement it, we could file it away in the issue for later.

I'm afraid we end up filing this in an issue. Not due to whether someone
wants, but due to if someone wants and has the time.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 20:40:54 2003

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.