subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Johan Corveleyn <jcor...@gmail.com>
Subject Re: History in subversion
Date Wed, 12 Jun 2013 21:39:30 GMT
On Wed, Jun 12, 2013 at 10:45 PM, Les Mikesell <lesmikesell@gmail.com> wrote:
> On Wed, Jun 12, 2013 at 2:41 PM, Olivier Antoine
> <oliviera201304@gmail.com> wrote:
...
>> Could you help more on diff dirs, please :
>> - What is the best way with SVN to compare a same directory on two different
>> branches ?
>
> Just check one out and diff the workspace against a different revision
> or branch path or both.

Or 'svn diff --old=^/branches/branch1 --new=^/branches/branch2'

(The ^/ syntax is shorthand for the repository root, when your current
working directory is inside a working copy (so svn can discover what
repository you're referring to). On Windows you have to escape the ^,
so it becomes ^^/).

In 1.8 you'll no longer need the --old / --new options for comparing
two arbitrary URLs, you can just type:

svn diff ^/branches/branch1 ^/branches/branch2

--
Johan

Mime
View raw message