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

RE: Re: Getting history of a file which was added when moving a folder

From: Rob Hubbard <Rob.Hubbard_at_celoxica.com>
Date: 2006-10-04 17:01:53 CEST

Hello Jörg,

That's a nicely cut-down demonstration of your problem.
However, SVN seems to be behaving correctly.

The command
        svn diff -r 3:2 file:///repository/svn/Test/folder2/file2
means
        svn diff -r 3:2 file:///repository/svn/Test/folder2/file2_at_BASE
and you probably have that for the current directory BASE=1

You can check this with
        svn info .

Do
        svn diff -r 3:2 file:///repository/svn/Test/folder2/file2_at_HEAD
or
        svn diff -r 3:2 file:///repository/svn/Test/folder2/file2_at_3
produce what you expect?

If so, then all you need do is an
        svn update
after the commit. (A commit does not, and should not, update your working copy.)

Then your original command
        svn diff -r 3:2 file:///repository/svn/Test/folder2/file2
will behave as you expect.

I hope I've got the details right here.

Rob.

-----Original Message-----
From: Jörg Eichhorn [mailto:eichhorn@ponton-consulting.de]
Sent: 04 October 2006 15:18
To: Subversion-Users
Subject: Re: Getting history of a file which was added when moving a
folder

Hello,

i can reproduce this problem with svn 1.4.0 using an new repository in
/repository/svn by doing the following in a temporary folder:

mkdir project
cd project
mkdir folder1
cd folder1
touch file1
cd ..
svn import -m "initial import" file:///repository/svn/Test
cd ..
rm -rf project
svn co file:///repository/svn/Test project
cd project
svn move folder1 folder2
cd folder2
touch file2
svn add file2
cd ..
svn ci -m "update1"
cd folder2
echo "foobar" > file2
svn ci -m "update2"

svn diff -r 3:2 file:///repository/svn/Test/folder2/file2

This results in:
svn: File not found: revision 1, path '/Test/folder1/file2'

I think svn should display that the text 'foobar' was added in revision 3
of file2.

Jörg

--On Mittwoch, 4. Oktober 2006 12:02 +0200 Jörg Eichhorn
<eichhorn@ponton-consulting.de> wrote:
> Hello,
>
> i have a the following problem with svn (version 1.3.2 - fsfs repository).
> When i do a 'svn -v log file:///repository/svn/trunk/path1/to/file'
> directly on the server i see several committed revisions (latest is 2586;
> previous is 2580).
> I try to get the differences between the last revisions 'svn diff -r
> 2586:2580 file:///repository/svn/trunk/path1/to/file'.
> This results in the error: svn: File not found: revision 2454, path
> 'file:///repository/svn/trunk/path2/file'
>
> The whole folder '/trunk/path2' was moved to '/trunk/path1/to' in rev
> 2457.
> The last revision of the older folder was 2454. The file which caused the
> problem was added in rev 2457.
>
> Any idea whats going wrong there?
>
> Thanks for help.
>
> Jörg Eichhorn
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

-- 
Jörg Eichhorn
_____________________________________________________________________
 Ponton Consulting GmbH                     voice:  +49.40.69213-340
 http://www.ponton-consulting.de/           fax:    +49.40.69213-355
 Dorotheenstrasse 60
 D-22301 Hamburg                mailto:eichhorn@ponton-consulting.de
_____________________________________________________________________
 HRB 81480, AG Hamburg, Managing Director: Dr. Michael Merz
 Ponton Consulting is a Member of C1 Group (www.c1-group.com)
_____________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
_____________________________________________________________________
This message has been checked for all known viruses by the MessageLabs Virus Scanning Service, on behalf of Celoxica Ltd.
This email and any files transmitted with it are confidential and 
may be legally privileged. It is intended solely for the use of the 
individual or entity to whom it is addressed. If you have received 
this in error, please contact the sender and delete the material 
immediately. Whilst this email has been swept for viruses, you 
should carry out your own virus check before opening any 
attachment. Celoxica Ltd accepts no liability for any loss or 
damage which may be caused by software viruses or interception 
or interruption of this email.
Received on Wed Oct 4 17:05:57 2006

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