Subversion resolve all conflicts quickly

Question

When I have several conflicts, is there a way to resolve them all by just telling SVN to keep the version that is in the repository? Unfortunately, we're still using 1.4.

Answer 1

I believe if you run the command svn revert . -R, you basically undo all changes to your working copy. If there are conflicted files, SVN tosses out your changes and uses the revision you've most recently updated to.

Of course, this also gets rid of changes to files that aren't conflicted.

Answer 2

svn update . --accept theirs-full

Or is that not available in svn 1.4?

You could try and run the 1.5 client against a 1.4 server, might work.

Answer 3

You can try

svn st | awk '/^C/ { print $2 }' | xargs svn revert

this revert all files with conflicts