Working copy / revision of TortoiseSVN not running as expected
I have a VS 2008 project controlled by TortoiseSVN. I am currently the only one using it.
I was trying to commit my last changes when I got the message "The abc file is out of date - please update". When I try to update a project, I get a whole bunch of file conflicts (binary and text). Since I am confident that my working copy contains the correct version of the files, I am trying to resolve conflicts by selecting "mine" as the correct version. I also tried just marking each file conflict as resolved. Then I can commit.
However, after that my VS 2008 project refuses to compile and gives hundreds of errors (so many errors that VS 2008 reports too many errors to show!). Something about conflict resolution TortoiseSVN is completely silent about the project and it refuses to build.
Is there anyway I can get TortoiseSVN to just keep my working copy in the repository as the latest version without checking for conflicts?
source to share
I hope you made a backup of your working copy before you upgrade, because otherwise most likely conflicts have led to a huge pile of comments >>>>>> theirs
and <<<<<<< mine
in your source files.
While I don't understand how conflicts might happen in the first place (since you are the only one committing the repository), a fix is possible.
Move your current working copy of the workstation to a safe location. Check out the project completely fresh. Copy the original files over your new working copy and then copy the changes you made.
When the source tree consists of multiple directories, it may be necessary to copy each directory separately. To overcome this, you can export your safe "working" working copy using TortoiseSVN → Export All. This creates a directory without all .svn files and directories. Then you can copy this exported directory over your new working copy.
source to share
I have found that Visual Studio project files are quite prone to automatic merge problems. The problem is that the file format is so repetitive that the merge utility has a very difficult time determining if a change is an addition or a modification. In addition, some actions seem to result in a rearrangement of Visual Studio in the project file. Again, these changes are relatively complex for the merge utility to handle correctly.
I am relying on one of two options to fix this. First, you can open the project file in notepad and fix it manually. They are not that hard and you can just follow the pattern and make sure nothing is in order.
The second approach would be to check in the project file and then add and remove files and make the necessary changes in Visual Studio.
If commits are done ahead of schedule and often, none of these tasks are too difficult. If bombs are removed from a storage facility, this is one of the many reasons why this happens sooner or later, and often a good idea. =)
source to share
Visual Studio and TortoiseSVN don't play together. One thing I noticed is that you cannot successfully update anything in the build directory because VS thinks it "owns" the build directories and will probably delete your .svn folder (this is just for builds with clean?)
You can take a look at the Subversion client that integrates into Visual Studio. AnkhSVN comes to mind, but http://sharpsvn.open.collab.net/ would be a good starting point to research . Alternatively, you can use sharpsvn directly from a pre-build or post-build task, or possibly a macro in Visual Studio.
source to share