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.wc |
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
|
Modifier and Type | Method and Description |
---|---|
static SVNConflictResult |
JavaHLObjectFactory.getSVNConflictResult(ConflictResult conflictResult) |
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
SVNCommandLineConflictHandler.handleConflict(SVNConflictDescription conflictDescription) |
SVNConflictResult |
SVNCommandLineConflictHandler.handleConflictNoStats(SVNConflictDescription conflictDescription) |
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. |
Copyright © 2018. All rights reserved.