I've got working copies of the same repository on two different computers (Macs). There is a file in question (let's say
SomeFile.m) which shows to be at r703 in both working copies, with no local modifications. Doing
svn update SomeFile.m on both sides produces no updates - it thinks it's totally up to date with the repository.
However, the two files are different. They have different checksums, and a diff shows differences that are important to the code. The file is correct in one of the working copies, but not the other.
Firstly, how do I force the incorrect file to be replaced with whatever's in the repository?
Secondly, how did this file get in this state in the first place? Through incorrect conflict resolution or something like that?