I am using Subversion in my builds. The first time I checkout to an empty folder everything is fine. But sometimes there is a conflict on the disk: A file was changed both in svn (code change) but also on the disk. (This happens in 2 cases - One is changes that we do in the build process in cases where we "plant" in the right build number. The other case where the file changes is after a WFWI compilation- the file gets changed during the compilation itself). In any case SVN detects that there is a "conflict" and instead of replacing the file with the new file from SVN - which is what I want, he thinks it is a real conflict, creates 3 files with extensions: .mine .r888 .r889 where 888 is the revision number. SVN also takes the original file and makes a merge inside. So what I want in short is to do a Checkout without comparing to the files on the disk- sorry that it sounds so complicated.
I would suggest doing a ‘Subversion Revert’ on the local working copy before updating, as this will undo any edits made during the build (what you want?). After the local edits have been reverted, you should be able to call ‘Subversion update’ to update the local working copy.
Thanks but this won’t be good for 2 reasons: First of all The command refers to the whole tree, and I want to get only the changes So I wouldn’t know what file has changed now, and I don’t want to revert to the whole tree. Second, some of the changes are needed (as I mentioned, i replace a certain string with the right version in some files, and I woudn’t want to lose my changes). Daphna
Thanks for replying. So you want to revert some files, but not other files? Is that right?
You should be able to specify a full path to the folder to revert, and a file spec to revert (the "Targets" section), for the Revert action. Does that help?