title: How can I fix this SVN commit which fails as "out of date"?
body: <p>In my repository, I have two revisions. The src code is on revision 2, but I had a file that messed up, so I reverted it to revision 1.</p>
  
  <p>After a few hours of debugging, that javafile works, but I can't commit it. SVN says that the javafile is out of date. This is probably because I'm editing javafile.java rev1, right?</p>
  
  <p>How do I resolve this? I know I could copy/paste my modified javafile rev1 code into its rev2 counterpart, and then commit, but is there another way? Am I using SVN incorrectly?</p>