From SVN 1.7 we can't easily use svn merge --dry-run to check for conflicts ahead of updating the working copy from the repo. This is because we can't run this command against a mixed mode working copy (very common as we don't always want to pull every time we do a push).
Instead we need to use svn status -u (or svn status --show-updates) and check for C in column 1 or 2, for existing conflicts, and * in column nine to detect conflicts between the working copy and the repo.
From SVN 1.7 we can't easily use
svn merge --dry-runto check for conflicts ahead of updating the working copy from the repo. This is because we can't run this command against a mixed mode working copy (very common as we don't always want to pull every time we do a push).Instead we need to use
svn status -u(orsvn status --show-updates) and check forCin column 1 or 2, for existing conflicts, and*in column nine to detect conflicts between the working copy and the repo.