Package org.tmatesoft.svn.cli.svn
Class SVNCommandLineConflictHandler
java.lang.Object
org.tmatesoft.svn.cli.svn.SVNCommandLineConflictHandler
- All Implemented Interfaces:
ISVNConflictHandler
- Since:
- 1.2.0
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate SVNConflictAcceptPolicy
private boolean
private SVNCommandEnvironment
-
Constructor Summary
ConstructorsConstructorDescriptionSVNCommandLineConflictHandler
(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment) -
Method Summary
Modifier and TypeMethodDescriptionprivate SVNConflictStats
handleConflict
(SVNConflictDescription conflictDescription) Handles the conflict given the conflict descriptionconflictDescription
and returnshandleConflictNoStats
(SVNConflictDescription conflictDescription) private void
-
Field Details
-
myAccept
-
mySVNEnvironment
-
myIsExternalFailed
private boolean myIsExternalFailed
-
-
Constructor Details
-
SVNCommandLineConflictHandler
public SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)
-
-
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
-
handleConflictNoStats
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException - Throws:
SVNException
-
showConflictedChunks
- Throws:
SVNException
-
getConflictStats
-