[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2003-10-30 06:09:56 CET

On Wed, 2003-10-29 at 22:58, Jack Repenning wrote:
> 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"?

The latter. It's an M:HEAD diff of URL1@HEAD, followed by an M:HEAD
diff of URL2@HEAD. (HEAD is only being used in two places because it's
the default for both N and for the peg rev. If you said "diff -rM:N
URL1 URL2", then it would be an M:N diff of URL1@HEAD followed by an M:N
diff of URL2@HEAD.)

If you want to diff URL1 against URL2, you don't use a -r parameter.
Maybe what you're getting at is that there's no way in my proposal to
say "diff URL1@R1-time-travelled-to-M against
URL2@R2-time-travelled-to-N". If we really want to support that, we
could (diff -r M:N --old=URL1@R1 --new=URL2@R2) but I'm not sure it's a
great idea. Maybe CMike has an opinion.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 30 06:10:40 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.