Class SvnNgAbstractUpdate.RecordConflictsResolver
java.lang.Object
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgAbstractUpdate.RecordConflictsResolver
- All Implemented Interfaces:
ISVNConflictHandler
- Enclosing class:
- SvnNgAbstractUpdate<V,
T extends AbstractSvnUpdate<V>>
private static class SvnNgAbstractUpdate.RecordConflictsResolver
extends Object
implements ISVNConflictHandler
-
Field Summary
Fields -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprivate List<SVNConflictDescription>
handleConflict
(SVNConflictDescription conflictDescription) Handles the conflict given the conflict descriptionconflictDescription
and returnsboolean
-
Field Details
-
conflicts
-
-
Constructor Details
-
RecordConflictsResolver
private RecordConflictsResolver()
-
-
Method Details
-
handleConflict
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException Description copied from interface:ISVNConflictHandler
Handles the conflict given the conflict descriptionconflictDescription
and returnsSVNConflictResult.getConflictChoice()
values ofSVNConflictChoice.MINE_CONFLICT
andSVNConflictChoice.THEIRS_CONFLICT
are not legal for conflicts in binary files or properties.- Specified by:
handleConflict
in interfaceISVNConflictHandler
- Parameters:
conflictDescription
- describes the exact nature of the conflict, and provides information to help resolve it- Returns:
- result for the conflict described by
conflictDescription
- Throws:
SVNException
-
getConflicts
-
hasConflicts
public boolean hasConflicts()
-