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

Can't remove file ... error when merging changes to a single file

From: Casper Hornstrup <chorns_at_users.sourceforge.net>
Date: 2005-02-12 19:42:32 CET

Try this:
 
svn co svn://svn.reactos.com/branches/xmlbuildsystem/reactos/bootdata
cd bootdata
svn merge -r 12735:13510 svn://svn.reactos.com/trunk/reactos/bootdata/icon.ico icon.ico
 
Subversion gives me an error:
svn: Can't remove file 'icon.ico.2.tmp': The system cannot find the file specified.
 
This works however:
svn co svn://svn.reactos.com/branches/xmlbuildsystem/reactos/bootdata
cd bootdata
svn merge -r 12735:13510 svn://svn.reactos.com/trunk/reactos/bootdata .

The first procedure should be possible right?
 
Server:
svnserve 1.1.2 + fsfs on Windows Server 2003
 
Client:
subversion 1.1.1 on Windows Server 2003 (I get the same result on Windows XP)
 
Casper
 
Received on Sat Feb 12 19:45:29 2005

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

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