svn commit: r1145664 - /subversion/trunk/subversion/libsvn_client/merge.c

[st...@apache.org]

Author: stsp
Date: Tue Jul 12 16:35:32 2011
New Revision: 1145664

URL: http://svn.apache.org/viewvc?rev=1145664&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=1145664&r1=1145663&r2=1145664&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul 12 16:35:32 2011
@@ -5633,7 +5633,7 @@ pre_merge_status_cb(void *baton,
         the child is switched or absent from the WC, or due to a sparse
         checkout.
      5) Path has a sibling (or siblings) missing from the WC because the
-        sibling is switched, absent, schduled for deletion, or missing due to
+        sibling is switched, absent, scheduled for deletion, or missing due to
         a sparse checkout.
      6) Path is absent from disk due to an authz restriction.
      7) Path is equal to MERGE_CMD_BATON->TARGET_ABSPATH.