Resource out of date try updating tortoisesvn
I know I could copy/paste my modified javafile rev1 code into its rev2 counterpart, and then commit, but is there another way?
Two questions: - can anyone explain this behaviour because I am very curious about it - this problem occurs in a perl script in a far more complex situation.
What typically works for me is to do another svn update after the merge, and then try to commit. If it fails, I do an svn cleanup, svn update, and then commit. I've seen this problem in versions of Svn/TSVN based on Svn 1.5.2, 1.5.4, and 1.6.1 (which is all the 1.5 versions I have seriously used). Update (SVN Update) to get them back from the server. Your working copy may actually be out of date in some obscure way.
Since I am the one who wrote our internal wiki, what I have suggested to my fellow developers is based on but with a little more to it based on my own experiences: 1.
We have some subtree mergeinfo as well; I don't know if that's related. In rare cases I have had to repeat the update and commit a few times.
This occurs in the typical merge from branch to trunk scenario (and probably in other scenarios). This isn't generally supposed to be necessary, but in one case it was.
The src code is on revision 2, but I had a file that messed up, so I reverted it to revision 1.
You have to update the file and pull out the previously made changes or you need to do a reverse merge to file the revision in the repository.
Can anyone give me a simple solution with is 'doable' in the perl script?
If I understand subversion correctly, the problem is this: Subversion tracks the current revision for each file and directory separately.
"Refresh" just means that Eclipse will update its view of the local filesystem, in case a file was changed outside Eclipse.
You need to do an update (Team- Refresh or F5 will only re-read what's currently checked out and check for local changes, i.e. The svn update command pulls any changes made remotely (commits) down to your workspace.Look at the help on how to revert a committed file.