would like to remvoe this ManagedService IF as discussed in the "KF OSGi :: Design Question".
While I was add it, ran into problems running more complicated configurations (as well a minor property name mistake of mine in HttpConfig.getDefaultConfig).
More on this later, but now an TurtoiseSVN question: I have locally modified a somewhat old revision of the trunk.
Now, before actually commiting my changes, I would like go back to the latest HEAD and then go from there, to prevent conflicts. In CVS, I would do an update and it might ask me whether to overwrite or not.
But when doing an update on a file in SVN, it just gives me "Completed: At revision 1050" and I am still stuck with my local changes?
What do I need to do?
Thanks and sorry for the tool question.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
By doing an "svn up" you update your code to "HEAD" automatically. Subversion will of course keep your changes but it should get you exactly the same situation as when you would have just checked out the latest version and then made your changes (unless you got some conflicts when doing the update).
If you really want to throw away your local changes, just delete everything and do an "svn up" then. That should get you a fresh copy of the latest version, but in this case I cannot see why you would want that.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
If you really, really want to throw away your changes you can do "svn revert" on all or parts of the directory structure. But this is not what you want to do in this case! :)
/Kaspar
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Following Marcel's suggestion, I deleted the whole http/http folder. As expected, after using the update function on the http folder all files were recreated from the repository (I think?). But these files still contained my modifications! At first I thought there is something funny with my version of TortoiseSVN, but even after updating to the latest 1.1.3, still the same.
And it does not have a "svn revert" feauture in the pop-up menus I get, is it necessary to use a different client program? Of course, there is always the option "Update to revision" in TotroiseSVN, but it asks me to manually enter a revision number.. wheach sounds funny, HEAD should always be the latest commited one on the server, rightt, not my "changes" before I officially commit them?!?
Thanks
Tom
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
My version of TortoiseSVN (which is really old - 1.0.0) does has a revert menu option which seems to work. But I normally use the command-line tools.
It sounds very strange that your uncommited stranges keeps haunting you. Svn does keep a local cache of all committed files, so you can normally do a revert without even accessing the network. In your case it sounds like svn thinks you *have* committed them. And r1050 is indeed almost the latest global head version (r1051 when I checked a minute ago, r979 is the latest commit to http, done by me in December).
A suggestion is to run
svn cleanup
...possible from the top level, and see if you get any reports or improvements.
You could also do a
svn info
to confirm that you really point the right repo etc ect.
/E
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
[te 20050228]
- in HttpConfig fixed minor property bug and removed unnecessary
ManagedService interface
- added support for ClientAuthentication.
To do that it is required for the SSLServerSocketFactory service
was created with a TrustManagers which contain valid client certs
and the HttpService has to have the use client authentication prop
enabled and it must end up using this SSLServerSocketFactory
service to create the SSL part.
(NOTE: currently the Browser will notice that the socket
establishment failed in the SSL Handshaking due to a bad certificate.
An alternative would be to allow the socket first to be established
and then return HttpServletResponse.SC_FORBIDDEN.)
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Hi Erik & Kaspar,
would like to remvoe this ManagedService IF as discussed in the "KF OSGi :: Design Question".
While I was add it, ran into problems running more complicated configurations (as well a minor property name mistake of mine in HttpConfig.getDefaultConfig).
More on this later, but now an TurtoiseSVN question: I have locally modified a somewhat old revision of the trunk.
Now, before actually commiting my changes, I would like go back to the latest HEAD and then go from there, to prevent conflicts. In CVS, I would do an update and it might ask me whether to overwrite or not.
But when doing an update on a file in SVN, it just gives me "Completed: At revision 1050" and I am still stuck with my local changes?
What do I need to do?
Thanks and sorry for the tool question.
By doing an "svn up" you update your code to "HEAD" automatically. Subversion will of course keep your changes but it should get you exactly the same situation as when you would have just checked out the latest version and then made your changes (unless you got some conflicts when doing the update).
If you really want to throw away your local changes, just delete everything and do an "svn up" then. That should get you a fresh copy of the latest version, but in this case I cannot see why you would want that.
Thanks.
If you really, really want to throw away your changes you can do "svn revert" on all or parts of the directory structure. But this is not what you want to do in this case! :)
/Kaspar
Marcel and Kaspar,
Following Marcel's suggestion, I deleted the whole http/http folder. As expected, after using the update function on the http folder all files were recreated from the repository (I think?). But these files still contained my modifications! At first I thought there is something funny with my version of TortoiseSVN, but even after updating to the latest 1.1.3, still the same.
And it does not have a "svn revert" feauture in the pop-up menus I get, is it necessary to use a different client program? Of course, there is always the option "Update to revision" in TotroiseSVN, but it asks me to manually enter a revision number.. wheach sounds funny, HEAD should always be the latest commited one on the server, rightt, not my "changes" before I officially commit them?!?
Thanks
Tom
My version of TortoiseSVN (which is really old - 1.0.0) does has a revert menu option which seems to work. But I normally use the command-line tools.
It sounds very strange that your uncommited stranges keeps haunting you. Svn does keep a local cache of all committed files, so you can normally do a revert without even accessing the network. In your case it sounds like svn thinks you *have* committed them. And r1050 is indeed almost the latest global head version (r1051 when I checked a minute ago, r979 is the latest commit to http, done by me in December).
A suggestion is to run
svn cleanup
...possible from the top level, and see if you get any reports or improvements.
You could also do a
svn info
to confirm that you really point the right repo etc ect.
/E
[te 20050228]
- in HttpConfig fixed minor property bug and removed unnecessary
ManagedService interface
- added support for ClientAuthentication.
To do that it is required for the SSLServerSocketFactory service
was created with a TrustManagers which contain valid client certs
and the HttpService has to have the use client authentication prop
enabled and it must end up using this SSLServerSocketFactory
service to create the SSL part.
(NOTE: currently the Browser will notice that the socket
establishment failed in the SSL Handshaking due to a bad certificate.
An alternative would be to allow the socket first to be established
and then return HttpServletResponse.SC_FORBIDDEN.)