Home/ Questions/Q 408769
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-12T17:43:27+00:00

In my repository, I have two revisions. The src code is on revision 2,

  • 0

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.

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?

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?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    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

    • 0