Eclipse: Difference between 'Revert' and 'Override and Update'

java eclipse svn synchronization revert
Vikram picture Vikram · Jul 27, 2011 · Viewed 25.9k times · Source

What is the difference between 'Revert' and 'Override and Update' options from Eclipse (team synchronization - SVN (Workspace) - Outgoing mode)?

Thanks in advance.

Answer

crowne picture crowne · Jul 27, 2011

Here is the scenario, assume that you and your team mate (Bob) are both in sync and up to date with the repository.

  • You both have local copies of hello.txt revision 100
  • Bob commits a change resulting in hello.txt(101) in the repository
  • You have uncommitted local changes against hello.txt(100)
    • If you try to commit you will get a conflict because your revision (100) is out of sync with the repository which is now at revision(101).
    • If you revert you will move back to revision 100, and lose your local changes
    • If you override and update your local changes will be overwritten by Bob's latest revision from the repository and you will end up with a local copy of revision (101).
    • If you merge the changes, and 'mark as merged' then you can commit and create revision (102).
    • Once you re-apply your changes and commit you will create revision (102).

Related questions

How do I check out an SVN project into Eclipse as a Java project?

I was trying to check out a project from SVN using Eclipse. I tried using "Checkout As" to make it into a "Java project from existing Ant script", but the project wizard requires the file to have already been downloaded. …

Read More
Why do I keep getting 'SVN: Working Copy XXXX locked; try performing 'cleanup'?

If you have worked with SVN tools in Eclipse (Subversion, subversive) before, then you are likely familiar with the 'working copy 'XXX' locked..." error. I found a very useful post with a workaround for this problem at: Working copy XXX …

Read More
Eclipse: "Update SVN cache" hangs and locks up

Every time I start eclipse, the program begins doing this "Update SVN cache" thing but it will sit at 0% forever. I cannot perform any operations (such as checking out my projects, building them, or even running them) until this operation …

Read More