Is it possible to always overwrite local changes when updating from SVN

svn

I have a file in a Subversion repository which changes almost every time it's opened in the IDE, thus creating conflicts on almost every update.

Is it possible to force SVN to always overwrite the local file with the one in the repository, even if there are local changes?

EDIT: It's a VB6 project file. Those contain GUIDs of the referenced ActiveX classes and their local file names. When a project is opened, the local file names are automaticall updated. It has to be under version control because the application cannot be built without it.

Best Answer

Firstly, I feel sorry for you for having to work in VB6.

Secondly, I suppose what you really need to do is delete the file before you update. So in this case, you could have a bat file called 'do update', and you just double-click that, instead of actually using TortiseSVN (or whatever) to do the updates. You make this bat delete it, and then, unsurprisingly, update.

Incredibly lame, but I do see your problem that the file needs to be in source control, yet you want to disregard general changes unless explicitly committed.

Related Solutions

Git – How to track local-only changes/change sets with git-svn

I am somewhat new to git, but I would recommend using a separate master and working branch in your local git repo.

Add your "non-SVN" files into the working branch only. Generally make all code changes in the working branch. When the "non-SVN" files change, add those using a unique commit, and set a commit message prefix (ie "local:" or "private:"). When you are ready to commit to SVN then:

Show a log of commits to add to SVN:
```
git co working
git cherry master
```
Add all upstream commits to the master branch, ignoring "private" commits. Repeat this step until all upstream commits are in master.
```
git co master
git cherry-pick <SHA1>
```
Push commits to SVN repo:
```
git svn rebase
git svn dcommit
```

Is it possible to make SVN ignore changes in character case

You can have SVN use an external diff tool to do diffs and merges, which could ignore whitespace. For example, the "diff" command on Unix has an --ignore-case option to ignore case.

Beware though, this will ignore case changes even when these are significant for VB, for example inside of strings.

A better option would probably be to standardize on whatever capitalization VB6 is trying to force on you (or turn off that option in VB6, if it as one), so that it isn't changing it in existing files all the time.

Best Answer

Related Solutions

Git – How to track local-only changes/change sets with git-svn

Is it possible to make SVN ignore changes in character case

Related Topic