Uses of Class
org.tmatesoft.svn.core.wc.SVNConflictResult

Packages that use SVNConflictResult

Package	Description
org.tigris.subversion.javahl	Provides a (mostly native, using JNI and javah) implementation of a high level Java API for Subversion.
org.tmatesoft.svn.cli.svn
org.tmatesoft.svn.core.internal.wc2.ng
org.tmatesoft.svn.core.javahl17
org.tmatesoft.svn.core.wc	This package provides a high-level API for managing Working Copies in a way compatible with the native SVN command line client.

Uses of SVNConflictResult in org.tigris.subversion.javahl

Methods in org.tigris.subversion.javahl that return SVNConflictResult

Modifier and Type	Method and Description
static SVNConflictResult	JavaHLObjectFactory.getSVNConflictResult(ConflictResult conflictResult)

Uses of SVNConflictResult in org.tmatesoft.svn.cli.svn

Methods in org.tmatesoft.svn.cli.svn that return SVNConflictResult

Modifier and Type	Method and Description
SVNConflictResult	SVNCommandLineConflictHandler.handleConflict(SVNConflictDescription conflictDescription)
SVNConflictResult	SVNCommandLineConflictHandler.handleConflictNoStats(SVNConflictDescription conflictDescription)

Uses of SVNConflictResult in org.tmatesoft.svn.core.internal.wc2.ng

Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNConflictResult

Modifier and Type	Method and Description
SVNConflictResult	SvnNgAbstractUpdate.RecordConflictsResolver.handleConflict(SVNConflictDescription conflictDescription)

Uses of SVNConflictResult in org.tmatesoft.svn.core.javahl17

Methods in org.tmatesoft.svn.core.javahl17 that return SVNConflictResult

Modifier and Type	Method and Description
private SVNConflictResult	SVNClientImpl.getSVNConflictResult(ConflictResult conflictResult)

Uses of SVNConflictResult in org.tmatesoft.svn.core.wc

Methods in org.tmatesoft.svn.core.wc that return SVNConflictResult

Modifier and Type	Method and Description
SVNConflictResult	ISVNConflictHandler.handleConflict(SVNConflictDescription conflictDescription) Handles the conflict given the conflict description conflictDescription and returns getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties.