A new version of Subversion 
has been released. Subversion 1.5 brings some really useful features, like Merge tracking and Interactive Conflict Resolution (client).
Until now, when running svn update on a linux commandline that included a conflicted file, you would get a really messed up set of file regarding the conflict. That is why a HTTP server would have to be stopped while updating, since it would make the website/application unusable.
But now, thanks to Interactive Conflict Resolution, you could do something like the following (described on their site):
$ svn up
U contrib/client-side/svnmerge/svnmerge_test.py
Conflict discovered in 'contrib/client-side/svnmerge/svnmerge.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: s
(p) postpone - mark the conflict to be resolved later
(df) diff-full - show all changes made to merged file
(e) edit - change merged file in an editor
(r) resolved - accept merged version of file
(mf) mine-full - accept my version of entire file (ignore their changes)
(tf) theirs-full - accept their version of entire file (lose my changes)
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: tf
G contrib/client-side/svnmerge/svnmerge.py
Updated to revision 25685.
$
And finally, Merge tracking means Subversion keeps track of what changes have been merged where. This reduces the overhead involved in maintaining branches, and gives users a way to inquire what changes are merged — or are available to be merged — on different lines of development.
Also, VisualSVN version 1.5 has been released to go with the latest features of Subversion.