Log Message: |
Add a conflict walker to the new svn_client_conflict API.
Contrary to our current libsvn_wc conflict walker, this walker guarantees
that new conflicts created during conflict resolution (which can happen
when resolving tree conflicts) are visited as well. The libsvn_wc walker
will visit such new conflicts only if they happen to be created in parts
of the working copy which the walker has not yet visited.
* subversion/include/svn_client.h
(svn_client_conflict_walk_func_t, svn_client_conflict_walk): Declare.
* subversion/libsvn_client/resolved.c
(svn_client_conflict_walk): Implement.
|