Here's how my SVN is set up:
1 - I have an SVN repository on my server and a local repository on my laptop
2 - I have checked out a copy of the SVN repository onto my development server
3 - I've got a post-commit hook that pushes changes made to the SVN repository onto the development server
I had a file open today (file.php) and wanted to see whether the dev server had the same version as my repository. So I checked and everything matched. Then I noticed something that I needed to change in the file. I thought I was changing the file on my local repository--turns out I changed the file on the development server by mistake.
My question is this: how can I get the development server back in sync with the repository? Do I need to update the dev server with the latest repository? Or do I need to commit the dev server repository to the main repository?
