subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Erik Andersson <kir...@gmail.com>
Subject Re: svn diff working copy against a different branch
Date Thu, 05 Aug 2010 08:04:19 GMT
On Wed, Aug 4, 2010 at 9:09 PM, Mark _ <mark_aok@hotmail.com> wrote:

>  Hi all,
>
> I have a system where there is a "trunk" and a branch called "branchX".  I
> have checked out branchX and merged the trunk code into branchX on my
> working copy.  I am trying to diff my working copy against trunk like so:
>      svn diff --old=http://path-to-dir/myDirectory --new=myDirectory
>
> the diff compares branchX WITHOUT the modifications in my working copy and
> shows many differences.
>
> The working copy is definitely identical to trunk becaue when I use the
> unix style diff (see below) there are absolutely no differences.
>
>      diff -rux ".svn" myDirectory /home/mark/myDirectory
>
> Is it possible to diff a working copy against code in another branch (trunk
> in this case)?  Or is it expected to checkout trunk and use a diff utility
> every time?
>
You could create a tag for your working copy and then diff that tag vs the
trunk.

Cheers / Erik

>
> I'm using svn 1.6.5.
>
> Thanks,
> Mark
>
>
>
>

Mime
View raw message