private static class SvnNgAbstractUpdate.RecordConflictsResolver extends java.lang.Object implements ISVNConflictHandler
Modifier and Type | Field and Description |
---|---|
private java.util.List<SVNConflictDescription> |
conflicts |
Modifier | Constructor and Description |
---|---|
private |
RecordConflictsResolver() |
Modifier and Type | Method and Description |
---|---|
private java.util.List<SVNConflictDescription> |
getConflicts() |
SVNConflictResult |
handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict description
conflictDescription and returns
SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and
SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties. |
boolean |
hasConflicts() |
private final java.util.List<SVNConflictDescription> conflicts
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException
ISVNConflictHandler
conflictDescription
and returns
SVNConflictResult.getConflictChoice()
values of SVNConflictChoice.MINE_CONFLICT
and
SVNConflictChoice.THEIRS_CONFLICT
are not legal for conflicts in binary files or properties.handleConflict
in interface ISVNConflictHandler
conflictDescription
- describes the exact nature of the conflict, and provides information
to help resolve itconflictDescription
SVNException
private java.util.List<SVNConflictDescription> getConflicts()
public boolean hasConflicts()