Is there a command to list SVN conflicts?

Question

Hello,

Does anyone know an SVN command to list current conflicts between the repo and the working copy?

Thanks

Answer 1

You could try svn merge -r <revision> --dry-run and see what happens that way.

Answer 2

It's maybe possible to use svn merge --dryrun while specifying the repository URL with all revisions after the latest one you updated with.

E.g. if your current WC is based on revision 147 this could do it:

svn merge -r 148:HEAD http://url.to.repo/repo/

It's nothing I've done myself though, so you'll have to try it yourself.

Answer 3

If you have already merged you can use

svn status

and see an uppercase "C" for conflict, but usually you shouldn't see such kind in your working copy.