William Uther <willu.mailingLists@cse.unsw.edu.au> writes:
> > 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
Yeah, this is pretty nice stuff. Gee whiz.
> Does this also work as a merge syntax?
I don't think we need to change merge syntax at all. It takes exactly
3 arguments: source, source, target. End of story. There's no need
for --old and --new stuff, because we're not trying to create an
iterative syntax.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 14:25:59 2003