Ensure that working copy locks are acquired correctly when resolving conflicts through svn_client_conflict_resolve(). Add a missing sleep for timestamps, too.
Ensure that working copy locks are acquired correctly when resolving conflicts
through svn_client_conflict_resolve(). Add a missing sleep for timestamps, too.

* subversion/libsvn_client/resolved.c
  (resolve_conflict): New helper function. Applies the same working copy
   locking as svn_client_resolve() during resolution and sleeps for timestamps.
  (resolve_text_conflict, resolve_prop_conflict, resolve_tree_conflict): Use
   the new helper function.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1693470 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion