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

.svn out of sync with repository

From: Jonathan Shore <jshore_at_iderive.biz>
Date: 2004-03-28 14:46:42 CEST

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
 
Received on Wed Mar 31 19:44:23 2004

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

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