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 java.lang.Object implements ISVNConflictHandler
-
-
Field Summary
Fields Modifier and Type Field Description private java.util.List<SVNConflictDescription>
conflicts
-
Constructor Summary
Constructors Modifier Constructor Description private
RecordConflictsResolver()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description private java.util.List<SVNConflictDescription>
getConflicts()
SVNConflictResult
handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict descriptionconflictDescription
and returnsboolean
hasConflicts()
-
-
-
Field Detail
-
conflicts
private final java.util.List<SVNConflictDescription> conflicts
-
-
Method Detail
-
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
private java.util.List<SVNConflictDescription> getConflicts()
-
hasConflicts
public boolean hasConflicts()
-
-