svn resolve --accept=working "$filename"
exit_on_error "resolving tree conflict by accepting the working directory as the right one"
svn resolve --accept=working "$filename"
exit_on_error "resolving tree conflict by accepting the working directory as the right one"