Author: stsp
Date: Tue Jul 12 16:17:42 2011
New Revision: 1145651
URL: http://svn.apache.org/viewvc?rev=1145651&view=rev
Log:
* subversion/libsvn_client/merge.c
(perform_obstruction_check): 'absent' -> 'server-excluded' terminology
update in docstring.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1145651&r1=1145650&r2=1145651&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul 12 16:17:42 2011
@@ -360,7 +360,8 @@ is_path_conflicted_by_merge(merge_cmd_ba
* - Return 'obstructed' if there is a node on disk where none or a
* different kind is expected, or if the disk node cannot be read.
* - Return 'missing' if there is no node on disk but one is expected.
- * Also return 'missing' for absent nodes (not here due to authz).
+ * Also return 'missing' for server-excluded nodes (not here due to
+ * authz or other reasons determined by the server).
*
* Optionally return a bit more info for interested users.
**/
