[PATCH] svn_client_diff_summarize() reports 'normal' if properties were changed

Hi,

The new API in 1.4 svn_client_diff_summarize() returns always
svn_client_diff_summarize_kind_normal as the diff->summarize_kind member
if there were property changes (if diff->prop_changed is true). And this
even if there actually were changes in the text part of a file.
The attached patch fixes this issue.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

[[[
Do not overwrite an important summarize status with 'normal'.
* subversion/libsvn_client/repos_diff_summarize.c
  (ensure_summarize): only overwrite the summarize status if it isn't
  svn_client_diff_summarize_kind_normal.
]]]
Index: subversion/libsvn_client/repos_diff_summarize.c
===================================================================
--- subversion/libsvn_client/repos_diff_summarize.c (revision 19446)
+++ subversion/libsvn_client/repos_diff_summarize.c (working copy)
@@ -89,8 +89,12 @@
 {
   svn_client_diff_summarize_t *sum;
   if (ib->summarize)
+ {
+ if (ib->summarize == svn_client_diff_summarize_kind_normal)
+ ib->summarize = sum_kind;
     return;
-
+ }
+
   sum = apr_pcalloc(ib->item_pool, sizeof(*sum));
 
   sum->node_kind = ib->node_kind;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 24 19:17:38 2006