[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Trying to compare a working copy against a branch using svn diff

From: thomas mauch <Thomas.Mauch_at_swisslog.com>
Date: 2005-06-01 08:48:47 CEST

I have a working copy where 753 lines in 4 files have been modified:
 
> svn status | grep ^M
4
> svn diff | wc -l
753

Now I want to compare this working copy agaings my branch in
svn://myhost/myproj/branches/mybranch. First I tried
> svn diff --new svn://myhost/myproj/branches/mybranch --old .
but the differences in the working copy are not listed.
 
With playing around, I then found that
> svn diff --old svn://myhost/myproj/branches/mybranch --new .
however works.
 
Here are the figures:
> svn diff --new svn://myhost/myproj/branches/mybranch --old . | grep
+++ | wc -l
29
> svn diff --old svn://myhost/myproj/branches/mybranch --new . | grep
+++ | wc -l
33
> svn diff --old svn://myhost/myproj/branches/mybranch --new . | wc -l
5297
> svn diff --new svn://myhost/myproj/elsa/branches/mybranch --old . | wc
-l
4544
 
As you can see the difference is exactly the 4 lines / 753 lines
modified in the working copy.
 
I'm not sure that now whether this behavior is by design or whether this
is a bug. In any case, the documentation of the svn diff commands does
not mention that it makes a difference whether you pass path A to --old
and path B to --new or vice versa nor would I have expected it - or I
did not understand it, the help is quite difficult to read.
 
I'm using Subversion 1.1.1.
 
Many thanks in advance
Thomas
 

____________________________________________________________
This message may contain legally privileged or confidential
information and is therefore addressed to the named persons only.
The recipient should inform the sender and delete this message,
if he/she is not named as addressee.
The sender disclaims any and all liability for the integrity
and punctuality of this message.
The sender has activated an automatic virus scanning by
Messagelabs, but does not guarantee the virus free
transmission of this message.
Received on Wed Jun 1 08:52:18 2005

This is an archived mail posted to the Subversion Users mailing list.