svn commit: r1241652 - /subversion/branches/moves-scan-log/subversion/include/svn_wc.h

[st...@apache.org]

Author: stsp
Date: Tue Feb  7 21:57:15 2012
New Revision: 1241652

URL: http://svn.apache.org/viewvc?rev=1241652&view=rev
Log:
On the moves-scan-log branch:

* subversion/include/svn_wc.h
  (svn_wc_conflict_choice_t): The conflict callback may well choose an
   incoming move on behalf of the user, so use language that doesn't
   imply otherwise in the docstring of svn_wc_conflict_choose_incoming_move.

Modified:
    subversion/branches/moves-scan-log/subversion/include/svn_wc.h

Modified: subversion/branches/moves-scan-log/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_wc.h?rev=1241652&r1=1241651&r2=1241652&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_wc.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_wc.h Tue Feb  7 21:57:15 2012
@@ -2120,8 +2120,8 @@ typedef enum svn_wc_conflict_choice_t
    * @since New in 1.8. */
   svn_wc_conflict_choose_copy_is_copy,
 
-  /** The user has chosen to map an incoming delete or copy to a
-   * server-side move. The incoming move is described by
+  /** The conflict callback has chosen to map an incoming delete or
+   * copy to a server-side move. The incoming move is described by
    * svn_wc_conflict_result_t and must not be NULL.
    * This choice causes the conflict callback to be invoked again with a
    * more specific conflict description.