[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Out of date errors

From: David Balažic <David.Balazic_at_comtrade.com>
Date: Tue, 27 Dec 2016 13:47:34 +0100

What you say below is wrong. There is no need for an explicit UPDATE in the scenario of >single user changes files and commits them every now and then<.
I do this for years, using different versions of TSVN thru the years. I never do an update, just commit about every second day and it works without any problems.

If there is a situation when an update is needed, TSVN tell that in clear language and even offers a button, to do an update and then later retry the commit.

I suspect the OP has a different problem.

David Balažic
Software Engineer

From: Bruce J Clark [mailto:BJClark_at_metrol.co.uk]
Sent: 26. December 2016 19:28
To: users_at_tortoisesvn.tigris.org
Subject: Re: Out of date errors


If I understand your issue correctly, this is more of a Subversion issue than a ToroiseSVN issue.

It is easy to get out of date errors, even for a stand-alone user. Fortunately, It's also easy to avoid.

To get out of date errors, simply checkout a project, make some changes and then commit those changes. At this point the local copy is "out of date" with the repo. The SVN commit process updates that the files that were changed but nothing else is updated in the local checkout. This includes the other checked out files and folders, including folders that contained files from the previous change. The latest repository revision is now higher that the local checkout, for everything except the items that were changed during the commit.

The easiest solution is simply to run the SVN update command after a commit. This uodates the local checkout to match the repository state. Now, as the only user, this is mostly cosmetic since nobody else will have changed the repo and so there will be no other changes to get during the update. However, the key thing is that the .svn folder is updated to confirm that the other files haven't been changed. [In a more typical repository, it's quite possible that other users have changed some of the other files and they'll need to be updated with those changes.]

What happens if you don't do the SVN update? You make further changes to the local copy. When the changes are complete, you run the SVN commit. The first step of the commit is to check that the local checkout is up to date; it isn't, because the repository is at a new revision (based on the earlier commit), compared to the local copy. [Remember, it's not just whether the files are the same, it's whether the local .svn folder has been updated.] At this point SVN, knows that the repsoitory has been updated since the last full checkout/update but it doesn't know what the differences are. SVN simply notes the difference between the repo and the local checkout and reports that the local checkout is out of date. At this point, TortoiseSVN, helpfully offers to run the update first, before retrying the commit. That should work just fine since you're the only repo user and there's nobody else changing the files. That's largely cosmetic since the file contents are already OK, and it's simply updating the .svn folder.

Hope this helps.

Bruce Clark
Senior Software Engineer

[Metrol logo]<http://www.metrol.co.uk>
Howe Moss Place, Kirkhill Industrial Estate, Dyce, Aberdeen, AB21 0GS
Switch: +44 (0) 1224 772771 Fax: +44 (0) 1224 772660

This email and any attachments or links herein are confidential and may contain Metrol Technology Limited proprietary information that is legally privileged or otherwise protected from disclosure. It is solely intended for the person(s) named above. If you are not the intended recipient, any reading, use, disclosure, copying or distribution of all or parts of this email or associated attachments or links to other web locations, is strictly prohibited. If you are not the intended recipient, please notify the sender immediately by replying to this message or by telephone and delete this email and any attachments or links permanently from your system. Metrol accepts no liability for any damage of whatever nature caused by this email. Registration Number SC105658. Registered in Scotland.

From: Drs. D.J.W. van Kooten <VanKooten_at_ic2.com<mailto:VanKooten_at_ic2.com>>
Sent: 26 December 2016 06:44
To: users_at_tortoisesvn.tigris.org<mailto:users_at_tortoisesvn.tigris.org>
Subject: Out of date errors

Dear Ladies and Gentlemen,

I started using Tortoise/Subversion a few years ago but after trying a previous version of a program and after that being unable to roll back to the latest version (I suspect I should have commited first but the program didn't want for it) and losing my changes I keep commiting from time to time but I am not using it as it was intended. When code I use has to be used by one of my employees (who all work on different locations) we simply send files and hand compare, which is a lot safer.

However, despite my "stand alone" use I regularely get out of date errors. The internet is full of this problem with dozens of different solutions. If always costs me a lot of time to solve it. The way I solved it now is to delete the .svn directory and re-register the project.

My question is: why isn't there a simple option to tell the program: stop complaining about conflicts and just commit the whole project/solution in the current state as the right code? Especially the way I work there could not be any out of date or conflict state except a "conflict" caused by the Subversion/Tortoise (no idea which of the 2 caused the problem). I couldn't find something like that in TortoiseSVN- either. That would at least save a lot of time.

Best regards,

Dick van Kooten

IC2 Innovative Computer Consultancy

IJsvogel 16








------------------------------------------------ DISCLAIMER ------------------------------------------------
Info & disclaimers www.ic2.com<http://www.ic2.com/> IC2, Sliedrecht/Holland.
This mail has been made with iConnect Mail from IC2<http://www.ic2.com/iconnect_uk/iconnect-e-mail/>
If you have Windows 10 / Windows 10 Phone, you can download our 365xDuurzaam10 app<https://www.microsoft.com/store/apps/9nblggh4vqj3>
(for Windows 8 365xDuurzaam app<http://apps.microsoft.com/windows/nl-nl/app/365xduurzaam/eccf272e-4989-4b25-908a-fbe8a9f6cf22>)

------------------------------------------------ DISCLAIMER ------------------------------------------------


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2016-12-27 13:48:02 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.