SVN check without recovery

Question

We have some middleware in the company, and sometimes it’s hard to find the right version I'm looking for, so I often have to update it to different versions in order to check them.

I usually check:

svn co svn+ssh://(username)@(ip)/srv/svn/intranet/trunk/PYTHON/<application> <local-application> 

Then I can upgrade to another version

 svn update (path) -r (rev) 

In most cases, after several attempts, this will lead to a Node conflict

If I delete the folder and try to perform a new check, it will simply restore what I had. All I want to do is check the revision, I haven’t made any changes and still thinks there are conflicts.

Ive tried to resolve them, but nothing works:

svn update -r 1586

 Skipped 'inm/inm' -- Node remains in conflict D inm/fabfile.py D inm/test.db.bak D inm/tests D inm/test.db D inm/doc D inm/test.ini D inm/test.sql U inm/setup.py A inm/inm.egg-info A inm/inm.egg-info/SOURCES.txt A inm/inm.egg-info/top_level.txt A inm/inm.egg-info/PKG-INFO A inm/inm.egg-info/entry_points.txt A inm/inm.egg-info/dependency_links.txt A inm/inm.egg-info/not-zip-safe A inm/inm.egg-info/paster_plugins.txt A inm/inm.egg-info/requires.txt U inm/setup.cfg Updated to revision 1586. Killed by signal 15. Summary of conflicts: Skipped paths: 1 svn resolved inm/inm Resolved conflicted state of 'inm/inm' (venv) svn update inm/inm -r 1586 Updating 'inm/inm': Password: Skipped 'inm/inm/templates' -- Node remains in conflict At revision 1586. Killed by signal 15. Summary of conflicts: Skipped paths: 1 

Answer 1

I think the answer I was looking for was

 svn revert --depth=infinity inm 

I do not care about local changes, only to upgrade to the new version. I have used this command several times and it seems to be a trick

EDIT

Having looked at my errors again, I see that many files were probably modified with tests or assemblies. I had to add them to the ignore file so that their changes were not detected by svn.

Answer 2

So:

• Do you only check and update from trunk , or do you sometimes check also a branch?
• Do you run any programs during testing?
• What to do if you performed svn status before starting the update? Do you have an original copy of the statement?

Conflicts can occur for many reasons.

Imagine that you modified a file that is in your Subversion repository, and then upgraded to an earlier version or a later version. Depending on how you do this, Subversion may try to merge the changes between what you did and what you check. Sometimes Subversion will not work unless you upgrade from the revision chapter. In this case, Subversion will report that the file is in conflict.

Another reason is because you created a file in your working directory that is not in your Subversion revision. When you upgrade the version of Subversion with this file, Subversion will report a conflict.

Then maybe there is something wrong with your system. We just do not have enough information right now.

The next time you do this, do svn status in your working directory before doing svn update . This is actually always a good idea. This will warn you of a possible conflict with Subversion during the upgrade.

One of the things that I missed in Subversion that CVS (and I didn't miss a lot about CVS) was an option that claims to execute your command. This will allow you to pretend to do the update and alert you to conflicts before you do the actual update. Alas, Subversion does not currently have such an option (although it was heavily requested).