CODEWITHSUNDEEP
svnupdates
Grim...
Grim...

Reputation: 16953

SVN merge an older version with the head

I committed some code yesterday from "Workstation A" that caused some problems on our live server, so I rolled the live working copy back with the command svn merge -r 652:651 ./ All was good.

Today I'm on Workstation B, and I updated my local copy, made some changes to the code and committed again. However, the live server merged the changes and left the bits changed in 652 as they were.

So my question is - I've got a live website that I can't take down, and I need to update it to the very latest working copy (654 at the time of writing).

How do I do that?

Upvotes: 0

Views: 78

Answers (1)

Björn Labitzke
Björn Labitzke

Reputation: 126

The files with "M" on the server are modified. After checking them with

svn diff <filename>

you can revert them to the checked in state, which should be what you want:

svn revert <filename>

Upvotes: 1

Related Questions