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

Re: svn diff and peg revisions

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-04-30 16:34:14 CEST

On Mon, 30 Apr 2007, Ronny Vlker wrote:

> Hello,
> the behavior of the diff command in svn1.4 irritates me in a particular case.
> I'm not sure whether it's a bug or I should better have asked this question in
> the users list.

Users list.

> Here is the case:
> I have a repository containing a trunk , one branch v1.0 and one tag v1.0.0.
> v1.0 was branched from trunk in revision 10.
> v1.0.0 was created from v1.0 in r20.
> The head revision of the repository is 30.
> I want to display the differences of v1.0 at r5 and the tag v1.0.0.
> Or more technical:
> Display the differences of the node, referenced by the path 'branches/v1.0' in
> HEAD, at revision 5 and the node, referenced by the path 'tags/v1.0.0' in HEAD,
> at revision HEAD.
> The command
> svn diff --old=http://branches/v1.0@5 --new=http://tags/v1.0.0
> returns something like: 'http://branches/v1.0 was not found in revision 5'.
> This sounds reasonable, because @5 could be interpreted as a peg revision.
Right, and the 1.0 line wasn't branch until r10, so doesn't exist at r5.

> So I would have to use -r to enter my operative revisions:
> svn diff -r5:head --old=http://branches/v1.0@head --new=http://tags/v1.0.0@head
> But this doesn't work either.
> So is there a command to do this diff without explicitly referring to http://trunk?

No -- it's assumed that you'll refer to revisions which actually exist
at a path when using peg revisions.

  • application/pgp-signature attachment: stored
Received on Mon Apr 30 16:35:02 2007

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.