public class SVNCommandLineConflictHandler extends java.lang.Object implements ISVNConflictHandler
Modifier and Type | Field and Description |
---|---|
private SVNConflictAcceptPolicy |
myAccept |
private boolean |
myIsExternalFailed |
private SVNCommandEnvironment |
mySVNEnvironment |
Constructor and Description |
---|
SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept,
SVNCommandEnvironment environment) |
Modifier and Type | Method and Description |
---|---|
private SVNConflictStats |
getConflictStats() |
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. |
SVNConflictResult |
handleConflictNoStats(SVNConflictDescription conflictDescription) |
private void |
showConflictedChunks(SVNMergeFileSet files) |
private SVNConflictAcceptPolicy myAccept
private SVNCommandEnvironment mySVNEnvironment
private boolean myIsExternalFailed
public SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)
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
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException
SVNException
private void showConflictedChunks(SVNMergeFileSet files) throws SVNException
SVNException
private SVNConflictStats getConflictStats()