Make libsvn_client obtain a write lock before calling the resolver code.
The working copy code shouldn't obtain write locks as that makes it impossible
for the client code to combine operations within a write lock.
(Obtaining a lock when a lock already exists raises an error)

* subversion/libsvn_client/resolved.c
  (svn_client_resolve): Use SVN_WC__CALL_WITH_WRITE_LOCK().

* subversion/libsvn_wc/conflicts.c
  (conflict_status_walker_baton): Remove wc_ctx from baton. Shouldn't be
     necessary.
  (conflict_status_walker): Don't obtain lock here.
  (svn_wc__resolve_conflicts): Update baton initialization.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1440220 13f79535-47bb-0310-9956-ffa450edef68