Re: Resolution of 'svn diff' change?

On Tuesday, May 20, 2003, at 01:53 PM, Greg Hudson wrote:

> On Mon, 2003-05-19 at 23:36, Ben Collins-Sussman wrote:
>> Luke Blanshard <luke@blanshard.us> writes:
>>
>>> This seems like the clearest and simplest approach being tossed
>>> around. But it's not getting much attention. Why is that exactly?
>
> Probably because I injected it late in the thread.
>
>> Ghudson, I think your proposal has some promise. But for those of us
>> who are a bit slow-witted, can you demonstrate how your --old/--new
>> diff syntax would be used to cover all five use-cases I outlined in
>> the earlier mail? Humour me... :-)
>
> 1. show local mods in a working copy
> svn diff
> (or: svn diff file1 file2 ..., if only for some files/dirs)
>
> 2. compare a wc path with a different version of itself
> svn diff -r M path
> (or: svn diff --old=url[@REV] path, to compare against a branch)
>
> 3. compare two specific versions of a wc path
> svn diff -r M:N path
> (or: svn diff --old=url1[@REV] --new=url2[@REV] path, to compare
> path in two different branches)
>
> 4. compare any two arbitrary repos paths/revs
> svn diff --old=url1[@REV] --new=url2[@REV]
>
> 5. compare a wc path to an arbitrary repos path
> svn diff --old=url1[@REV] --new=path
>

   6. compare a couple of files (file1 file2 file3) in two different
branches (branch_url1 and branch_url2).
      svn diff --old=branch_url1[@REV] --new=branch_url2[@rev] file1
file2 file3

Does this also work as a merge syntax?

Case 1 makes no sense as merge
Case 2 makes no sense as merge
Case 3 does make sense:

      svn merge -r M:N path
      (or: svn mer --old=url1[@REV] --new=url2[@REV] path, to compare
       path in two different branches)

   Compares the path [at the given revisions] and then merges the diff
into the current working copy

Case 4 does make sense

      svn merge --old=url1[@REV] --new=url2[@REV]

   Compares the two paths and merges the diff into the current working
copy

Case 5 makes no sense as merge
Case 6 does make sense

      svn merge --old=branch_url1[@REV] --new=branch_url2[@rev] file1
file2 file3

   Compares the supplied files from the two branches [at the given
revisions] and then merges the diff into the current working copy

Will :-}

--
Dr William Uther                            National ICT Australia
Phone: +61 2 9385 6926             School of Computer Science and 
Engineering
Email: willu@cse.unsw.edu.au             University of New South Wales
Jabber: willu@jabber.cse.unsw.edu.au          Sydney, Australia
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org