/[Apache-SVN]
ViewVC logotype

Revision 1687906


Jump to revision: Previous Next
Author: stsp
Date: Sat Jun 27 10:35:42 2015 UTC (8 years, 9 months ago)
Changed paths: 2
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.


Changed paths

Path Details
Directorysubversion/trunk/subversion/include/svn_client.h modified , text changed
Directorysubversion/trunk/subversion/libsvn_client/resolved.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26