You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/01/24 03:01:18 UTC

svn commit: r1560881 - in /subversion/branches/1.8.x: ./ subversion/include/svn_wc.h

Author: breser
Date: Fri Jan 24 02:01:18 2014
New Revision: 1560881

URL: http://svn.apache.org/r1560881
Log:
Merge r1497614 from trunk: documentation fix

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/subversion/include/svn_wc.h

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1497614

Modified: subversion/branches/1.8.x/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_wc.h?rev=1560881&r1=1560880&r2=1560881&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_wc.h Fri Jan 24 02:01:18 2014
@@ -4077,6 +4077,9 @@ typedef void (*svn_wc_status_func_t)(voi
  * @a ignore_patterns is an array of file patterns matching
  * unversioned files to ignore for the purposes of status reporting,
  * or @c NULL if the default set of ignorable file patterns should be used.
+ * Patterns from #SVN_PROP_IGNORE (and, as of 1.8,
+ * #SVN_PROP_INHERITABLE_IGNORES) properties are always used, even if not
+ * specified in @a ignore_patterns.
  *
  * If @a cancel_func is non-NULL, call it with @a cancel_baton while walking
  * to determine if the client has canceled the operation.