The merge appears to work okay; however, the commit fails with the following error message.Commit failed (details follow): File 'flex/src/com/penbay/invision/portal/services/http/soap/Report Services/Get All Bldgs Params By Region By Site Result Event.as' is out of date '/svn/ibis/!
I made a change in Text Edit on the project after freshly checking it out from the repository, the same out of date error occurred when trying to commit the change via Smart SVN. SVN folder files did not fix the problem 3 - I changed a single file and then updated it recursively then tried committing it. 4 - Updating the same file non-recursively then committed it. 5 - Saved a text file in the top level of the directory outside of the android project folders that says “hi” on the inside.Added to the repository, committed, opened it and made a change so it read “hello world”, committed, and it works.The coolest Interface to (Sub)Version Control /_/ \_\ Message.do?ds Forum Id=4061&ds Message Id=2271275 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].svn/wrk/531d459d-80fa-ea46-bfb4-940d79ee6d2e/visualization/trunk/source/flex/src/com/penbay/invision/portal/services/http/soap/Report Services/Get All Bldgs Params By Region By Site Result Event.as' path not found You have to update your working copy first. I have even checked out a new one into a different folder to make sure there wasn't any local cruft messing with the merge.
I have done some more research into this and I think part of the problem is user error.$ svn commit -m "comment" Sending svn: E160042: Commit failed (details follow): svn: E160042: File or directory 'pom.xml' is out of date; try updating svn: E160024: resource out of date; try updating $ svn info Path: . Did svn change an existing revision of a file with my change without updating any metadata? If your working copy is out of date (or you have local modifications) and you want to see the HEAD revision of a file in your working copy, svn cat -r HEAD FILENAME will automatically fetch the HEAD revision of the specified path: My working copy is definitely up to date.Working Copy Root Path: working/dir URL: https://not.relevant Repository Root: https://not.relevant Repository UUID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx Revision: 11943 Node Kind: directory Schedule: normal Last Changed Author: otherguy Last Changed Rev: 11856 Last Changed Date: 2012-01-04 0100 (Wed, ) And it shows the merged version of the file! There is of course the slight possibility of my change already existing in HEAD (added by otherguy), so that after the update, my change would be redundant.Instead you should leave your working revision at the head, and use the revert/merge tool (or drop new content) to remove the change which would be applied to your working version.I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. I'm on a team that has an android project that is running into an SVN out of date error.