Author: julianfoad
Date: Fri Aug 22 12:53:23 2014
New Revision: 1619788
URL: http://svn.apache.org/r1619788
Log:
* subversion/include/private/svn_wc_private.h
(svn_wc__get_diff_editor): Correct the documentation of 'reverse_order'.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1619788&r1=1619787&r2=1619788&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri Aug 22
12:53:23 2014
@@ -1553,8 +1553,12 @@ svn_wc__get_switch_editor(const svn_delt
* if they weren't modified after being copied. This allows the callbacks
* to generate appropriate --git diff headers for such files.
*
- * Normally, the difference from repository->working_copy is shown.
- * If @a reverse_order is TRUE, then show working_copy->repository diffs.
+ * Normally, the difference from repository->working_copy is shown. If
+ * @a reverse_order is TRUE, then we want to show working_copy->repository
+ * diffs. Most of the reversal is done by the caller; here we just swap the
+ * order of reporting a replacement so that the local addition is reported
+ * before the remote delete. (The caller's diff processor can then transform
+ * adds into deletes and deletes into adds, but it can't reorder the output.)
*
* If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
* to periodically check if the client has canceled the operation.
