subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Branko Čibej <>
Subject Re: FreeBSD project and subversion.
Date Wed, 06 Feb 2013 11:41:05 GMT
On 06.02.2013 07:21, Branko Čibej wrote:
> Given all the above, I think we should find a way to warn users --
> with a one-line note in the header of the diff output, for example? --
> about the cases where the two-parameter diff could be ambiguous
> (which, I believe, is when both parametrs are WC paths or URLs); and
> further, when any of the paths are unversioned. 

One other option would be, as was noted elsewhere in this thread, to
invent a new subcommand for tree comparisons, keeping only the
historical differences feature in "svn diff".

That would solve the ambiguity, but it would (a) break backward
compatibility, and (b) invent yet another subcommand, which we don't like.

Yet another option would be to introduce a new option, so instead of using

    svn diff --old A --new B

you'd get

    svn diff --compare A B

to generate a diff between the two targets, and plain

    svn diff A B

to get the historical diff of each target.

Unfortunately this option has all the drawbacks of the new subcommand,
and none of the benefits (the benefit being that with a subcommand, the
help text could be shorter, since that's tied to the subcommand, not
individual options).

-- Brane

Branko Čibej
Director of Subversion | WANdisco |

View raw message