Force SVN update / checkout to overwrite local files

svn overwrite svn-update svn-checkout
siliconpi picture siliconpi · May 1, 2011 · Viewed 69.4k times · Source

i'm planning to run (on my server!)

svn update

to update my LIVE website with updates. However, i'm worried about 'C' conflicts which will prevent my site scripts from functioning. How can I force the checkout / update process to overwrite all local files (on my server!)?

I know one solution would be to do this on a separate directory - any thing else more efficient?

i've looked at Force an SVN checkout command to overwrite current files

I dont have --force option

Answer

Fausto Carvalho Marques Silva picture Fausto Carvalho Marques Silva · May 2, 2011

If you don't have --force option i think you do not have either the --accept. The svn update have a new option called --accept to "specify automatic conflict resolution action". It could be: postopone, mine-conflict, theirs-conflict, edit, launch, theirs-full, mine-full or base.

An svn help update will help!

Related questions

Why is Git better than Subversion?

I've been using Subversion for a few years and after using SourceSafe, I just love Subversion. Combined with TortoiseSVN, I can't really imagine how it could be any better. Yet there's a growing number of developers claiming that Subversion has …

Read More
Working copy XXX locked and cleanup failed in SVN

I get this error when I do an svn update: Working copy XXXXXXXX locked Please execute "Cleanup" command When I run cleanup, I get Cleanup failed to process the following paths: XXXXXXXX How do I get out of this loop?

Read More
How do I return to an older version of our code in Subversion?

I'm working on a project with a friend and I want to return to an older version of our code and set it to be the current. How do I do it? I'm using "anksvn" on vs08. I have the …

Read More