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

Field Summary

Fields

Modifier and Type	Field and Description
private SVNConflictAcceptPolicy	myAccept
private boolean	myIsExternalFailed
private SVNCommandEnvironment	mySVNEnvironment

Constructor Summary

Constructors

Constructor and Description
SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)

Method Summary

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)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

myAccept

private SVNConflictAcceptPolicy myAccept

mySVNEnvironment

private SVNCommandEnvironment mySVNEnvironment

myIsExternalFailed

private boolean myIsExternalFailed

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 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.

Specified by:

handleConflict in interface ISVNConflictHandler

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

private void showConflictedChunks(SVNMergeFileSet files)
                           throws SVNException

Throws:

SVNException

getConflictStats

private SVNConflictStats getConflictStats()