anticipate conflicts with --dry-run in script

I have a couple scripts which run "svn merge" periodically, for example:
http://code.google.com/p/qubit-toolkit/source/browse/trunk/symfony/cron.daily/drop

I run "svn merge --dry-run" first, to exit and make no changes to the
working copy if "svn merge" would introduce conflicts. But I am having
trouble detecting whether it anticipates conflicts because "svn merge
--dry-run" exits with status zero whether or not it anticipates
conflicts.

How can I get my script to exit if "svn merge --dry-run" anticipates
conflicts?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1020281

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-12 22:52:05 CET