Author: stsp
Date: Sat Jun 27 12:02:26 2015
New Revision: 1687913
URL: http://svn.apache.org/r1687913
Log:
* subversion/libsvn_client/resolved.c
(svn_client_conflict_walk): Fix silly bug (potential infinite loop): Reset
conflicts_found counter during each iteration, not just before first one.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1687913&r1=1687912&r2=1687913&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jun 27 12:02:26
2015
@@ -304,7 +304,6 @@ svn_client_conflict_walk(const char *loc
b.conflict_walk_func = conflict_walk_func;
b.conflict_walk_func_baton = conflict_walk_func_baton;
b.ctx = ctx;
- b.conflicts_found = 0;
/* ### Re-run the status walk until a walk finds no conflicts at all.
* ### This is a crude implementation but provides the guarantees we offer
@@ -314,6 +313,7 @@ svn_client_conflict_walk(const char *loc
*/
do
{
+ b.conflicts_found = 0;
SVN_ERR(svn_wc_walk_status(ctx->wc_ctx, local_abspath, depth,
FALSE, /* get_all */
FALSE, /* no_ignore, */
