Package org.tmatesoft.svn.cli.svn
Class SVNCommandLineConflictHandler
- java.lang.Object
-
- org.tmatesoft.svn.cli.svn.SVNCommandLineConflictHandler
-
- All Implemented Interfaces:
ISVNConflictHandler
public class SVNCommandLineConflictHandler extends java.lang.Object implements ISVNConflictHandler
- Since:
- 1.2.0
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
-
Constructor Summary
Constructors Constructor Description SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description SVNConflictResult
handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict descriptionconflictDescription
and returnsSVNConflictResult
handleConflictNoStats(SVNConflictDescription conflictDescription)
-
-
-
Constructor Detail
-
SVNCommandLineConflictHandler
public SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)
-
-
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
-
handleConflictNoStats
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException
- Throws:
SVNException
-
-