Menu
I've got a file (mapViewController.m) which is in svn but I cannot commit changes to it. I tried to copy the file elsewhere and then update. The file does not come with the update so I copy it back. Then I can't commit changes to it.
This is hard to explain what is wrong... because I don't know.
673
An svn commit of the file will fail with an “out-of-date” error. The file should be updated first; an svn update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict.
To view or break locks, right-click in the Current Folder browser and select Source Control > Locks. If you see an SVN message reporting a working copy locked error, remove stale locks. In the Current Folder browser, right-click and select Source Control > SVN Cleanup.
Select any file and/or folders you want to commit, then TortoiseSVN → Commit.... The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file.
svn locking information may have become corrupt and performing an svn cleanup on the local working copy may resolve this issue. Installing TortoiseSVN and restarting enables a cleanup option in the right-click menu of the local working copy (the parent folder that contains the .
This problem is frequent when I do merge from branche X -> Y, What work usually for me (from Eclipse):
-make a copy of the file/folder (A)
-delete the file/folder from the working repo
-update
-copy file/folder from (step A)
-Commit.
188
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
