svn commit: r1458542 - /subversion/trunk/subversion/libsvn_wc/wc.h

[ju...@apache.org]

Author: julianfoad
Date: Tue Mar 19 22:10:22 2013
New Revision: 1458542

URL: http://svn.apache.org/r1458542
Log:
* subversion/libsvn_wc/wc.h
  (svn_wc__internal_merge): Tweak doc string: don't
    claim we never change the file on disk, as we do in some cases.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc.h

Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1458542&r1=1458541&r2=1458542&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue Mar 19 22:10:22 2013
@@ -388,10 +388,12 @@ svn_wc__internal_file_modified_p(svn_boo
                                  apr_pool_t *scratch_pool);
 
 
-/* Prepare to merge a file content change into the working copy.  This
-   does not merge properties; see svn_wc__merge_props() for that.  This
-   does not change the working file on disk; it returns work items that
-   will replace the working file on disk when they are run.
+/* Prepare to merge a file content change into the working copy.
+
+   This does not merge properties; see svn_wc__merge_props() for that.
+   This does not necessarily change the file TARGET_ABSPATH on disk; it
+   may instead return work items that will replace the file on disk when
+   they are run.  ### Can we be more consistent about this?
 
    Merge the difference between LEFT_ABSPATH and RIGHT_ABSPATH into
    TARGET_ABSPATH.