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

Re: Diff syntax changes for issue #1093

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-10-30 04:58:32 CET

At 9:53 PM -0500 10/29/03, Greg Hudson wrote:
>Incidentally, you seem to be using your own terminology here, and that
>can only lead to confusion. If you read libsvn_fs/structure, you will
>find that we don't call anything a "version" except for the svndiff
>version number. So when you're tempted to talk about "choosing a
>version," instead say, "choosing a node-revision."

Sorry. Thanks for the correction. I've been looking for those words
for some time. Thought I'd checked that file, as a matter of fact,
yet as you can see I remained confused. Maybe it'll stick this time.

>> > diff [-r M[:N]] [TARGET...]
>> >
>> >Each target may be a path or URL, but it is invalid to specify a URL
>> >with no -r option. Perform a pegged diff for each target. For paths,
>> >the default starting rev is BASE, the default ending rev is WC, and the
>> >peg rev is always WC. For URLs, there is no default starting rev (-r
>> >option must be present),
>> This seems once again to muddle "find the node" and "pick the
>> versions," doesn't it?
>No, just because the default ending rev is the same as the fixed peg rev
>doesn't mean I'm muddling them together.

Does "diff -rM URL1 URL2" mean "diff URL1 against URL2 in some way"?
Or "diff URL1 against some -rM ancestor of itself, then do that again
for URL2"?

If the former, then isn't "M" being used twice, once to select "the
pegged node-rev", and again to specify "the start rev"? That would
be what I meant by "muddled."

>I'll change the question a bit: "what changes were made to libsvn_ra_dav
>and mod_dav_svn between the 0.32 branch and the trunk?"
>svn diff --old=http://svn.collab.net/repos/svn/branches/0.23
> --new=http://svn.collab.net/repos/svn/trunk
> subversion/libsvn_ra_dav subversion/mod_dav_svn
>You might say, "gosh, that's some mighty complicated syntactic sugar
>there, since it's just equivalent to two successive svn diff commands
>with the paths tacked onto the old and new URLs."

Actually, I said "gosh, that's a great example and makes it very clear."

Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835.8090
f: 650.228.2501
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 30 04:59:14 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.