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

Re: svn diff problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-05-07 03:57:05 CEST

Garrett Rooney <rooneg@electricjellyfish.net> writes:

> i've seen this behavior mentioned on the list before, and i never got
> a satisfactory answer to it.
>
> running 'svn diff -r 1878:1879 packages/freebsd/subversion' in the top
> level of a checked out svn tree produces a diff that includes a diff
> of the html that mod_dav_svn spits out for the directory
> packages/freebsd/subversion. this can't possibly be what we want the
> user to see in this situation...
>
> if you leave off the 'packages/freebsd/subversion' argument, the
> output is as i would expect.

I'm not sure what the issue is here.

In the first example, you're running

     svn diff -r X:Y foo/bar/baz

...which means, "do a diff between foo/bar/baz and itself at two
different revisions". Thus I expect all paths to be relative to baz.
After all, the server is comparing two versions of baz, and driving an
editor to describe the differences. Thus 'baz' is the root of the
tree-delta.

In the second case, you're running

     svn diff -r X:Y

...which means, "do a diff between '.' and itself and at two different
revisions." If '.' happens to be the top of your tree, then you're
going to see *all* diffs within /trunk. (Of course, in your
particular example, all changes in commit Y happened to be within baz
anyway)

So I turn the question around, what do you expect to see?

- Ben, who is getting tired of discussing diff's interface. Sigh.

(At least it's not an 'svn status' discussion!)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 7 04:04:42 2002

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