TortoiseSVN - "you need to update your working copy first"

When I try to make a mistake, I get this error. What this was done, I think, is renaming the folder. I tried renaming / moving the folder. But I keep getting the error.

Command: Commit Error: Commit failed (details follow): Error: File 'Page.aspx' is out of date Error: File not found: transaction '99-4a', path '/trunk/src/Solution.UI/Views/ViewName/Page.aspx' Error: You have to update your working copy first. 

I am trying to update, but unfortunately the problem is not resolved.

 Command: Update Completed: At revision: 99 

Edit: after deleting the files from the folder, perform an update to restore them, and replace the restored files with the originals. I get this error:

 Error: Commit failed (details follow): Error: Base checksum mismatch on '/trunk/src/Solution.UI/Views/ViewName/Page.aspx': Error: expected: ed3bc4a70ee4256bd2f7cf8c57f29a1f Error: actual: b8a2797dc262dc714fae6dc897b5ebd2 
+7
tortoisesvn
source share
8 answers

SVN knows that changes have occurred in the repository, but he does not know what these changes are. You may have made the same change in your working copy, but if you are not really trying to upgrade so that SVN can run the solution, it will not verify that your local changes match the repo changes.

Do svn update , and conflict resolution should be automatic. Although, if you make changes to the same files, it may ask you to manually allow, even if it is the exact same change (even more likely if the change was renamed to a folder)

You may need svn resolved to manually resolve conflicts.

Worst of all, you can always copy files that you changed, undo local changes, update and replace files in a new folder.

+13
source share

I am using TortiseSVN and have encountered a problem that you are facing.

Attempt: delete the directory and files in it.

My resolution path (all effective procedure)

  • Select the appropriate files. Right click | TortiseSVN | Delete

    Answer: files marked for deletion.

  • Right click on directory contents | TortiseSVN | Fix

    Answer: files are deleted.

  • Right-click the next-higher directory from the above containing directory | SVN Update

    Answer: update completed.

  • Right-click the directory I want to delete | TortiseSVN | Delete

    Answer: The directory marked for deletion.

  • Right-click on the following directory from the above directory to remove | SVN Commit

    Answer: remote directory

The process is completed.

+2
source share

You need to update a working copy.

That is, do the “Update SVN” to get the latest version, and make sure your changes do not conflict.

+1
source share

Do an "SVN Cleanup" then upgrade

+1
source share

It looks like you have a page.asx file in your working copy and it no longer exists in the repository?

perhaps try deleting it physically from your disk, or if it still just needs to move it to another location, try executing it and then adding it again?

+1
source share

Sometimes you may get these strange problems with working copies, and in spite of all the attempts, you won’t be able to get it to work again, and you cannot completely do your job. One way to get out of this situation is to do the following:

  • Check your project in a new folder.
  • Copy the modified files only from the old working copy to the new working copy. If you do this often, it will not take much time. If you commit once a month, it may take some time ...
  • Double check that the change list is the same on both working copies.
  • Commit a new working copy.
  • Delete your old working copy and check it again.

It is not very pleasant to do so, because it does not show you what went wrong and why, but if you just want to continue your work, then it is nice to know that there is a quick solution.

+1
source share

When executing svn commit

you just need to remove the marked deleted or missing files.
0
source share

I tried this solution and it works great for me. 1-Export the working copy to another Temp directory. 2-Delete all files in your working directory 3-Go to the working directory 4-copy files in the Temp directory to the working directory, overwriting all existing files 5- Commit

0
source share

All Articles