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

Issue 2333: svn diff URL1 URL2 / diff URL2 URL1

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2005-08-30 23:07:00 CEST

Hello all,

I've been looking at issue 2333. The initial report was that the output
from svn diff differs depending on the order of the arguments.

I think that the particular instance reported in that report can be
demonstrated by just the following (using svn 1.2.3):

$ svn log -r1084 -v svn://svn.debian.org/pkg-exim4/exim
r1084 | zugschlus | 2005-04-03 07:36:17 +0100 (Sun, 03 Apr 2005) | 3 lines
Changed paths:
   D /exim/trunk/debian/exim4-config-simple
   A /exim4-config-simple/trunk/exim4-config-simple (from /exim/trunk/debian/exim4-config-simple:1083)

move exim4-config-simple to its own part of the repository, out of the
main package

$ svn diff -r1083:1084 svn://svn.debian.org/pkg-exim4/
(which shows only the additions to /exim4-config-simple, and no deletions
to /exim)
$ svn diff -r1083:1084 svn://svn.debian.org/pkg-exim4/exim
(which returns no output)

I believe that the problem here is equivalent to that demonstrated with
the following script:



rm -rf repo wc

svnadmin create repo
svn co $REPO wc

cd wc
mkdir A B A/P
echo content > A/P/x
svn add A B
svn ci -m 'initial checkin'

svn mv $REPO/A/P \
        $REPO/B \
        -m 'Move P from A to B'

Now compare the two following diffs, neither of which are displaying any
deletions (and also note the revision numbers that are displayed next
to each file compared with the revisions that were requested):

$ svn diff -r1:2 $REPO
Index: B/P/x
--- B/P/x (revision 0)
+++ B/P/x (revision 2)
@@ -0,0 +1 @@

$ svn diff -r2:1 $REPO
Index: A/P/x
--- A/P/x (revision 0)
+++ A/P/x (revision 1)
@@ -0,0 +1 @@

Note that the results shown above would be correct for 'svn diff -r0:2'
and '-r0:1' respectively.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 30 23:07:43 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.