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.
+2
A:
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.
Nick Meyer
2009-07-10 14:03:29
SVN tosses out your changes and uses the version you originally checked out; you still need to do an svn update to get the current HEAD version from the repository.
Roger Lipscombe
2009-07-10 14:04:16
@Roger: but if you have conflicted files, then you've run svn up. It is the version that svn up pulled from the repository that svn reverts to (unless this changed, I tested it with 1.6.3).
Nick Meyer
2009-07-10 14:09:29
clarified my answer accordingly :)
Nick Meyer
2009-07-10 14:11:11
nice idea. i'll leave it open for a while to see if there's a more elegant solution.
nategood
2009-07-10 14:11:15
+1
A:
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.
Michael Wiles
2009-07-10 14:22:09
I ran a 1.5 client with a 1.4 server for a while. For most purposes it works fine, but you lose the automatic merge tracking, for one thing. See the "compatibility concerns" in the 1.5 release notes (http://subversion.tigris.org/svn_1.5_releasenotes.html).
Nick Meyer
2009-07-10 14:26:35