At the interactive resolver prompt, don't end the program if a conflict resolution error occurred. Such errors can now happen if the user picks an option which cannot be applied for some reason which cannot be known in advance. So keep looping the prompt in such cases until the user resolves or postpones the conflict, or quits resolution entirely.
At the interactive resolver prompt, don't end the program if a conflict resolution
error occurred. Such errors can now happen if the user picks an option which cannot
be applied for some reason which cannot be known in advance. So keep looping the
prompt in such cases until the user resolves or postpones the conflict, or quits
resolution entirely.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): New parameters 'postponed' and 'printed_description'.
   The description is only shown during the first loop iteration. (In the future,
   we could add a new menu command which shows the description again.)
  (handle_prop_conflicts): Same. This function uses an internal loop which is now
   immediately terminated if the user quits. Remember 'postponed' state for the
   last prop conflict handled, but don't exit the inner loop on 'postpone'.
  (handle_tree_conflict): Same.
  (resolve_conflict_interactively): Pass new parameters through.
  (svn_cl__resolve_conflict): Allow the user to retry resolution if it failed.


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

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