Svn commit failed out of date

Question

Hi, I'm kinda new to SVN plus I'm usually on a 1-2 man project so most of the time I'm the only one using it.

Here's the deal,

In my repository there are a total of 2 revisions of all of the src code. The src code are currently on revision 2 but one of my files fuzzed up so I reverted it to its revision 1 counterpart.

Now after a few hours of debugging and stuff that javafile works but I can't commit it, it says javafile is out of date, this is probably because I'm currently editing javafile.java revision 1 right?

So how do I resolve this? I know that one solution is to copy paste my javafile revision 1 code into its revision 2 counterpart and the committing, but is there any other way? am I using svn wrong?

Answer 1

Updating the working copy should fix it.

From the command line:

X:\WorkingCopy>svn up

or right-click and choose SVN Update... in TortoiseSVN

When you update, you may come across conflicts, which will be marked in your code with

>>>>>
...
-----
...
<<<<<

You'll need to manually resolve these. When you're done, don't forget to mark the file as resolved.

X:\WorkingCopy>svn resolve \path\to\file

or right-click and choose TortoiseSVN -> Mark as Resolved... in TortoiseSVN

Answer 2

Update your working copy, and resolve the merge conflicts by copying the resulting file that has your locally modified version over the version with conflict markers in in. Run svn resolved on it, and check that in. This does assume there are no other changes that you want to preserve.