SVN: how to solve 'file has been replaced' status

svn coda
dwenaus picture dwenaus · Mar 22, 2011 · Viewed 7.1k times · Source

I was modifying files renaming them and switching them around (I was testing alternative homepages). Now I get a status message that says 'File has been replaced' and an R. I'm not sure what to do to solve this. I'm using Coda, and it does not solve it. So i guess it's command line time. The version that I care about is my local version, and I want to overwrite the remote version. i'm the only person working on it so a brute force approach is fine.

Answer

Version Control Buddy picture Version Control Buddy · Mar 22, 2011
  1. Copy the file and put it in a temp location
  2. Run "svn revert "
  3. Now copy it back to the same location
  4. Run "svn st " to check status

Related questions

SVN certificate trust error with XCode 4.2 or Coda, but not with command-line or svnX

I just got a new Mac (with Lion) and am setting everything up, but I am stuck on this SVN certificate trust error for my repositories on Assembla. The most common solution seems to be to move to Terminal and …

Read More
Why is Git better than Subversion?

I've been using Subversion for a few years and after using SourceSafe, I just love Subversion. Combined with TortoiseSVN, I can't really imagine how it could be any better. Yet there's a growing number of developers claiming that Subversion has …

Read More
Working copy XXX locked and cleanup failed in SVN

I get this error when I do an svn update: Working copy XXXXXXXX locked Please execute "Cleanup" command When I run cleanup, I get Cleanup failed to process the following paths: XXXXXXXX How do I get out of this loop?

Read More