On Tuesday, February 05, 2013 12:59:43 PM Johan Corveleyn wrote:
> On Tue, Feb 5, 2013 at 1:39 AM, Alexey Neyman <stilor_at_att.net> wrote:
> > On Monday, February 04, 2013 10:17:29 PM Stefan Sperling wrote:
> >> On Mon, Feb 04, 2013 at 11:54:21AM -0800, Alexey Neyman wrote:
> >> > Is there a reason why it is necessary to use "the svn diff --old
> >> >
> >> > ^/somebranch --new ." instead of the intuitive "svn ^/somebranch ."?
> >>
> >> Would "svn diff ^/somebranch ." be synopsis 1?
> >>
> >> svn diff -rN:M ^/somebranch_at_HEAD .@HEAD
> >
> > It cannot be "synopsis 1", as its description states that "TARGETs may be
> > all working copy paths or all URLs". In this case, we have one of each.
> > Moreover, synopsis 1 says that for URLs, -r or -c must be present - and my
> > example has no -r/-c option.
>
> Sorry, that's not true. From 'svn help diff' of 1.7:
>
> diff (di): Display the differences between two revisions or paths.
> usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]
> 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \
> [PATH...]
> 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]
>
> So for usage 1 the -c and -r are optional.
You didn't quote the second part of 'svn help diff' description of synopsis 1.
Here it is:
1. Display the changes made to TARGETs as they are seen in REV between
two revisions. TARGETs may be all working copy paths or all URLs.
If TARGETs are working copy paths, N defaults to BASE and M to the
working copy; if URLs, N must be specified and M defaults to HEAD.
The '-c M' option is equivalent to '-r N:M' where N = M-1.
Using '-c -M' does the reverse: '-r M:N' where N = M-1.
If you read it, you'll see that
(a) Mix of URLs and paths are not allowed for this synopsis
(b) For URLs, either -r or -c must be provided
Regards,
Alexey.
y.
Received on 2013-02-05 18:22:33 CET