Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc17 | |
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 |
---|---|
SVNMergeResult |
DefaultSvnMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options) |
Modifier and Type | Method and Description |
---|---|
SVNMergeFileSet |
SVNConflictDescription.getMergeFiles()
Returns information about files involved in the merge.
|
Modifier and Type | Method and Description |
---|---|
SVNMergeResult |
ISVNMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options)
Performs a text merge.
|
Constructor and Description |
---|
SVNConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNConflictDescription object. |
SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
String propertyName,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNPropertyConflictDescription object. |
SVNTextConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNTextConflictDescription object. |
Copyright © 2023. All rights reserved.