views:

201

answers:

3

Title says it all: I'd like to have a particular version-controlled file always be clobbered by the head revision when I do an SVN update, instead of manually having to resolve it every time I update. Does such a property exist? Or, less likely, does Tortoise SVN have its own option for that?

Edit: Some more explanation - there is a particular built file which gets checked in by a build machine; when working locally, I recompile that file myself if I'm working on its source. When I do an update on my entire repository, I really don't care if that particular file gets clobbered, since I'll just recompile it myself regardless. Force syncing is not really an option, because I don't want to accidentally clobber my source files, just these particular exceptions.

A: 

Isn't that called a force sync to head?

dirkgently
So what? <filling space up to 15 chars>
Seb
You can force sync to head revision all files for which you do not want to be bothered with manual resolution.
dirkgently
Can you specify that on a per-file basis though without doing the sync's themselves on a per-file basis?
Not Sure
I don't think so.
dirkgently
+3  A: 

in subversion update command in a switch called *--accept :

svn up --accept [postpone|base|mine-full|theirs-full|edit|launch]

which triggers the interactive conflict-resolution.

Same is possible in TortoiseSVN. Dialog shows up if first conflict occured

Peter Parker
This would apply to all files covered by the update, not the specific file I am interested in, correct?
Not Sure
yes, you cannot control the update without scripting
Peter Parker
A: 

The answer is no, there is not any built-in functionality for this.

Not Sure