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

Re: Resolution of 'svn diff' change?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-23 02:46:55 CEST

Philip Martin <philip@codematters.co.uk> writes:

> Greg Hudson <ghudson@MIT.EDU> writes:
>
>> usage: 1. svn diff [-r N[:M]] [--old=OLD-TARGET] [--new=NEW-TARGET] [PATH ...]
>> 2. svn diff -r N[:M] URL
> [...]
>> Does anyone else want to have a crack at implementing this?
>
> Yes.

It works. I'd like to add

          3. svn diff URL1[@N] URL2[@M]

             Shorthand for 'svn diff [-rN[:M]] --old URL1 --new URL2'
             where N and M default to HEAD.

The reason for this is so that I think there should be a diff command
with the same syntax as the merge command

   svn merge URL1[@N] URL2[@M] path

so that a user can preview the changes to be merged without having to
"translate" the command.

It is possible to have a directory called 'http:', and so have a
working copy path called 'http:/foo', which could be written with an
additional directory separator as 'http://foo', and two such paths
would cause an URL to URL comparison rather than an iterative BASE to
working copy comparison. I don't see this a serious problem, it's no
worse than 'svn mkdir', and 'svn diff --old . http://foo http://bar'
would recover the iterative behaviour.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 23 02:47:45 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.