On Jan 23, 2005, at 8:29 AM, Ingo Adler wrote:
>
> ------------------
> C:\temp\projects\testproject\testfolder1>svn move testfile1.txt
> testfile2.txt
> A testfile2.txt
> D testfile1.txt
>
> C:\temp\projects\testproject\testfolder1>svn commit -m "moved file"
> Deleting testfolder1\testfile1.txt
> Adding testfolder1\testfile2.txt
>
> Committed revision 58.
>
Okay, so testfolder1 is at r57, testfile2 is at r58.
> C:\temp\projects\testproject\testfolder1>cd ..
>
> C:\temp\projects\testproject>svn move testfolder1 testfolder2
> A testfolder2
> D testfolder1\testfile2.txt
> D testfolder1
>
> C:\temp\projects\testproject>svn commit -m "moved directory"
> Deleting testfolder1
> Adding testfolder2
> Adding testfolder2\testfile2.txt
> svn: Commit failed (details follow):
> svn: Out of date: '/trunc/testproject/testfolder1' in transaction '35'
>
You can't delete a directory unless its working-revnum is HEAD. See
the end of chapter 2, "the limitation of mixed revisions".
> C:\temp\projects\testproject>svn update
> At revision 58.
Now the directory deletion will work, since testproject is now at rHEAD.
>
> C:\temp\projects\testproject>svn commit -m "moved directory"
> Deleting testfolder1
> Adding testfolder2
> Adding testfolder2\testfile2.txt
>
> Committed revision 59.
Now testproject is at r58, testfolder2 is at r59, testfile2 is at r59.
>
> C:\temp\projects\testproject>svn move testfolder2 testfolder1
> A testfolder1
> D testfolder2\testfile2.txt
> D testfolder2
>
> C:\temp\projects\testproject>svn commit -m "moved directory back"
> Adding testfolder1
> Deleting testfolder2
>
> Committed revision 60.
Now testproject is still at r58, testfolder1 is at r60.
(By the way, 'svn status -v' will show all of these working revnums.)
>
> C:\temp\projects\testproject>cd testfolder1
>
> C:\temp\projects\testproject\testfolder1>dir
> Volume in Laufwerk C: hat keine Bezeichnung.
> Volumeseriennummer: 28BC-0E82
>
> Verzeichnis von C:\temp\projects\testproject\testfolder1
>
> 23.01.2005 15:10 <DIR> .
> 23.01.2005 15:10 <DIR> ..
> 23.01.2005 15:10 <DIR> .svn
> 23.01.2005 15:10 4 testfile2.txt
> 1 Datei(en) 4 Bytes
> 3 Verzeichnis(se), 6'842'249'216 Bytes frei
>
> C:\temp\projects\testproject\testfolder1>svn move testfile2.txt
> testfile1.txt
> A testfile1.txt
> D testfile2.txt
>
> C:\temp\projects\testproject\testfolder1>svn commit -m "moved file
> back"
> Adding testfolder1\testfile1.txt
> Deleting testfolder1\testfile2.txt
> svn: Commit failed (details follow):
> svn: Out of date: '/trunc/testproject/testfolder1/testfile1.txt' in
> transaction
> '38'
This makes no sense to me. And when I try to reproduce this (by
walking through your whole recipe), I can't. That's pretty strange.
Can you re-run this whole prodecure, showing us the output of 'svn st
-v' at every step?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 23 16:04:07 2005