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

Re: Cannot diff after file rename

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-02-07 12:00:30 CET

Peter N. Lundblad wrote:
> On Mon, 6 Feb 2006, Simon Large wrote:
>> Hi folks,
>> Having renamed and modified a file in the same commit, I am unable to
>> diff the current revision against the previous one using its new name.
>> Am I missing something obvious, or is this a bug? Using svn 1.3.0.
> svn diff --old=OLDURL@OLDREV --new=newfile
> So, you need to specify both the old and new name and another problem is
> that you can't specify a non-existing WC path, so you need to us an URL.
> http://subversion.tigris.org/issues/show_bug.cgi?id=1902
> seems relevant to the last part.

I thought the whole point of a pegrev was that it allowed history
tracing without me having to do the legwork of finding out what the URL
was in a previous revision.

Another data point for you:
I have made a small change to the recipe on line 15. If I modify
TestB.txt instead of TestA.txt, the following diff works across the name
change. This makes me think there is more to this than first appears.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

if exist repos rd /s/q repos
if exist wc rd /s/q wc
md repos
md wc
svnadmin create repos
:: Sorry about the absolute path here
svn co file:///c:/temp/diffbug/repos wc
cd wc
echo TestA > TestA.txt
echo TestB > TestB.txt
svn add TestA.txt TestB.txt
svn ci -m "r1" .
:: On the following line, if I modify TestA.txt I cannot diff TestB-New.txt at the end.
:: If I modify TestB.txt at this point I can diff TestB-New.txt at the end.
echo Changed >> TestB.txt
svn ci -m "r2" .
svn mv TestB.txt TestB-New.txt
echo Renamed >> TestB-New.txt
svn ci -m "r3" .
:: These all fail - how do I diff these 2 revs?
svn diff TestB-New.txt -r3:2
svn diff TestB-New.txt@BASE -r3:2
svn diff TestB-New.txt@3 -r3:2

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 7 11:59:48 2006

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