RE: .svn out of sync with repository

["Burgess, Glenn" <Gl...@dsto.defence.gov.au>]

I've had this problem. I keep hoping I will see somebody else file a bug report -- I haven't felt qualified enough to do it myself.
 
In particular the problem seems to occur if I add a file (or copy with subversion), then delete it before committing (I haven't got around to retesting it to be sure). Anybody else had a problem like this? I'm using TortoiseSVN and svn 0.37.
 
I think I only solved it by deleting the directory (file-system delete, not SVN) and checking the directory out again. You can then copy over your changed files to be committed and you're back in business.
 
Glenn.
 

-----Original Message-----
From: Jonathan Shore [mailto:jshore@iderive.biz]
Sent: Sunday, 28 March 2004 22:17
To: dev@subversion.tigris.org
Subject: .svn out of sync with repository 



I am getting commit failures as says that a given resource is already in the repository (in SVN 1.0.1 on a windows client against a linux server over svn+ssh).  The problem is that the files should never have been queued for addition.  Here is what is happening:
 
$ svn add mpeg1/*.java
A         mpeg1\BitInputStream.java
A         mpeg1\FrameStream.java
A         mpeg1\Huffmann.java
A         mpeg1\IDCT.java
svn: warning: 'mpeg1/MPEG1Codec.java' is already under version control
A         mpeg1\MotionModel.java
A         mpeg1\MovieFrame.java
 
$ svn commit -m 'synchronizing with SVN since CVS changeover'
Adding         codecs\mpeg1\BitInputStream.java
Adding         codecs\mpeg1\FrameStream.java
Adding         codecs\mpeg1\Huffmann.java
Adding         codecs\mpeg1\IDCT.java
Adding         codecs\mpeg1\MotionModel.java
Adding         codecs\mpeg1\MovieFrame.java
Transmitting file data ......svn: Commit failed (details follow):
svn: File already exists: filesystem '/home/repository/vibe/db', transaction '1n', path '/trunk/Libraries/java/src/org/ivibe/canvas/codecs/mpeg1/BitInputStream.java'

The workspace side correctly notes that MPEG1Codec.java is already under version control but does not note BitInputStream.java.  How do I recover from this sync problem?
 
Thanks
 
--
Jonathan Shore
Derive Inc