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

Re: Issue with svn log --diff option

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 28 Mar 2012 09:50:19 +0100

Yves Martin <ymartin1040_at_gmail.com> writes:

> $ svn log resources/favicon.ico
> ------------------------------------------------------------------------
> r429 | B | 2010-06-15 14:35:13 +0200 (mar, 15 jun 2010) | 1 line
> ------------------------------------------------------------------------
> r388 | B | 2010-03-05 16:52:29 +0100 (ven, 05 mar 2010) | 2 lines
> ------------------------------------------------------------------------
> r288 | B | 2009-08-28 11:18:37 +0200 (ven, 28 aoû 2009) | 1 line
> ------------------------------------------------------------------------
> r98 | A | 2008-02-25 12:17:51 +0100 (lun, 25 fév 2008) | 2 lines
> ------------------------------------------------------------------------
>
> The file has been moved from different location with copy operations
> in revision 288 and then 429.
>
> $ svn log --diff resources/favicon.ico
>
> - is able to generate the diff for 388-429 move
> - fails to generate the diff for 98-288 move with the error message:
>
> svn: E160013: Diff target 'REPO/resources/favicon.ico' was not found
> in the repository at revisions '287' and '288'
>
> So I would say the diff option is able to pass through one copy
> operation but not two copy operations.
>
> I hope my description is enough to create a test case to
> confirm/invalidate my hypothesis.

It handles multiple moves, but there is a problem somewhere:

svnadmin create repo
svn co file://`pwd`/repo wc
echo zig > wc/f
svn add wc/f
svn ci -mm wc
svn mv wc/f wc/g
echo zag > wc/g
svn ci -mm wc
svn mv wc/g wc/h
echo zog > wc/h
svn ci -mm wc
svn mv wc/h wc/i
echo zug > wc/i
svn ci -mm wc

$ svn log --diff file://`pwd`/repo/i
------------------------------------------------------------------------
r4 | pm | 2012-03-28 09:47:37 +0100 (Wed, 28 Mar 2012) | 1 line

m

Index: h
===================================================================
--- h (.../h) (revision 3)
+++ h (.../i) (revision 4)
@@ -1 +1 @@
-zog
+zug

------------------------------------------------------------------------
r3 | pm | 2012-03-28 09:45:04 +0100 (Wed, 28 Mar 2012) | 1 line

m

Index: g
===================================================================
--- g (.../g) (revision 2)
+++ g (.../h) (revision 3)
@@ -1 +1 @@
-zag
+zog

------------------------------------------------------------------------
r2 | pm | 2012-03-28 09:45:02 +0100 (Wed, 28 Mar 2012) | 1 line

m

Index: f
===================================================================
--- f (.../f) (revision 1)
+++ f (.../g) (revision 2)
@@ -1 +1 @@
-zig
+zag

------------------------------------------------------------------------
r1 | pm | 2012-03-28 09:45:00 +0100 (Wed, 28 Mar 2012) | 1 line

m

svn: E160013: Diff target 'file:///home/pm/sw/subversion/obj/repo/i' was not found in the repository at revisions '0' and '1'

-- 
Philip
Received on 2012-03-28 10:51:04 CEST

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

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