diff options
| author | James McCoy <jamessan@debian.org> | 2018-10-02 21:50:32 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2018-10-02 21:50:32 -0400 |
| commit | 784e881a5aaa645a37eda4fb775484f27c81143a (patch) | |
| tree | 3702672116cb73f976a31fd30a57824e12339050 /subversion/libsvn_client/repos_diff.c | |
| parent | fb8514369ffb04ec2aea8d8ee7916fdff101b84e (diff) | |
| parent | db2274467e932f2ac8f15a9372bbe32aa4fdfeb1 (diff) | |
Update to upstream 1.11.0~rc2
[git-debrebase anchor: new upstream 1.11.0~rc2, merge]
Diffstat (limited to 'subversion/libsvn_client/repos_diff.c')
| -rw-r--r-- | subversion/libsvn_client/repos_diff.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/subversion/libsvn_client/repos_diff.c b/subversion/libsvn_client/repos_diff.c index 58fe8aa..17b537c 100644 --- a/subversion/libsvn_client/repos_diff.c +++ b/subversion/libsvn_client/repos_diff.c @@ -51,6 +51,7 @@ #include "private/svn_subr_private.h" #include "private/svn_wc_private.h" #include "private/svn_editor.h" +#include "private/svn_sorts_private.h" /* Overall crawler editor baton. */ struct edit_baton { @@ -380,7 +381,7 @@ get_file_from_ra(struct file_baton *fb, way. Hence this little hack: We populate FILE_BATON->PROPCHANGES only with *actual* property changes. - See http://subversion.tigris.org/issues/show_bug.cgi?id=3657#desc9 and + See https://issues.apache.org/jira/browse/SVN-3657#desc9 and http://svn.haxx.se/dev/archive-2010-08/0351.shtml for more details. */ static void @@ -404,15 +405,9 @@ remove_non_prop_changes(apr_hash_t *pristine_props, if (old_val && svn_string_compare(old_val, change->value)) { - int j; - - /* Remove the matching change by shifting the rest */ - for (j = i; j < changes->nelts - 1; j++) - { - APR_ARRAY_IDX(changes, j, svn_prop_t) - = APR_ARRAY_IDX(changes, j+1, svn_prop_t); - } - changes->nelts--; + /* Remove the matching change and re-check the current index */ + svn_sort__array_delete(changes, i, 1); + i--; } } } |