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

Re: doing a diff between the trunk and a tag

From: John Szakmeister <john_at_szakmeister.net>
Date: 2003-08-20 19:46:27 CEST

On Wednesday 20 August 2003 09:33, cmpilato@collab.net wrote:
> John Szakmeister <john@szakmeister.net> writes:
> > > $ svn diff --old=branch/tag1 --new=branch/tag2
> > > svn: Incorrect parameters given
> > > svn: Sorry, svn_client_diff was called in a way that is not yet
> > > supported.
> > > svn: do_diff: paths aren't equal!
> > >
> > > (that doesn't work!)
> >
> > Hmmm. I took another quick look at this, and from the error it implies
> > that it only supports looking at a different version of the same file.
>
> Current, 'svn diff' doesn't support the comparitive working copy path
> case unless the paths being compared are the same and revision of one
> is BASE and the other is WORKING.

The usage information seems to indicate that this should be supported,
although I do see in the code exactly what you are talking about.

>
> > svn diff branch/tag1 branch/tag2
>
> That means something different. That means "show me my local mods in
> branch/tag1, and then show me my local mods in branch/tag2".

Ah... That seems a little counter-intuitive. As a user I'd expect this to
work exactly the same as usage case 3.

> > I did a quick look through the issue tracker and don't see this listed.
> > Perhaps this one should get listed?
>
> Nope. You gotta understand the "expected" before claiming a differing
> "actual".

I agree to that assesment. :-)

> If you want to file a feature request for the working copy
> comparitive case, have at it -- but I'll toss into Post-1.0
> immediately. Why? Ever heard of "diff -ru --exclude '.svn'"?

I can live with that too. But I feel as if 'svn diff' is claiming to do
something that it cannot, and I feel that is misleading to the end users.
Also, what's not clear to me is that in usage case 1, is it okay to do:

svn diff --new=my_checkout_repo/README \
--old=file://<path to repo>/branches/tag1/README

From the usage description, I would expect that this should work as well,
although in my setup, it is producing no output, and no error. If I specify
both with a URL I see the diff. But if one or the other is a working copy
path, I get nothing.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 20 19:49:09 2003

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