I am running Servoy 4.1, both on a Mac (leopard) and on Windows XP. Both are configured with the Subversive plugin. I am able to checkout my solution with no problem and I am able to do commits to upload changes.
The problem is when I make a change to my working copy (which shows SVN as my repository), then do an SVN Update. I would expect that I would get rolled back to the previously committed version and my recent changes would be lost, which is what I want. Problem is, the update doesn’t update anything.
I have also tried doing commits on one computer, then I do an update on the other. I would expect the latest changes to get downloaded. This does not work. None of the changes are coming down during an Update command. If I delete the project locally, then checkout a clean copy, I get all the changes and it works.
So, bottom line, SVN with Subversive Update functionality seems broken to me. Please let me know if I’m doing something wrong.
I am running Servoy 4.1, both on a Mac (leopard) and on Windows XP. Both are configured with the Subversive plugin. I am able to checkout my solution with no problem and I am able to do commits to upload changes.
The problem is when I make a change to my working copy (which shows SVN as my repository), then do an SVN Update. I would expect that I would get rolled back to the previously committed version and my recent changes would be lost, which is what I want. Problem is, the update doesn’t update anything.
What your looking for is not update, but revert. That will bring your working copy back to the base revision, aka the revision that you checked out locally.
I have also tried doing commits on one computer, then I do an update on the other. I would expect the latest changes to get downloaded. This does not work. None of the changes are coming down during an Update command. If I delete the project locally, then checkout a clean copy, I get all the changes and it works.
If in this case you changed the file on computer A, made some changes on computer B, which then checked in these changes and now you do an update on computer A you may be in a conflict state. subversion will try its best to magically merge the changes from computer B into your local working copy (which you can then check in with both sets of changes), however if the changes conflict with each other you will be left with you working copy file being the same + three other files with the names .mine, .r12, .r13 (the rX being a revision number). I think the actual book rather than myself can give you a better understanding on what to do in this case http://svnbook.red-bean.com/en/1.4/svn. … le.resolve
I actually don’t know how the plugin handles conflicts, it may make it easy to handle, but I always jump into a plain text editor to handle these cases out of old habit.
I didn’t make any changes on the 2nd computer and just want to get the latest from svn. I do this every day outside of servoy and it works fine. I’m not dealing with conflicts in this case.
I always use team-synchronize. There you can see clearly incoming/outgoing changes and conflicts (eve filter to see all changes of one type).
Then you can - now knowing exactly what happened to each resource - update/commit/overwrite and update/merge/mark as merged.
You will not get updates/revert to original when you update but have an outgoing change on the resource (or there is a conflict) - because you could this way loose your work by mistake while trying to update for something else.