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 |
---|---|
protected DefaultSVNMergerAction |
DefaultSVNMerger.getMergeAction(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
DefaultSVNMerger.handleChooseMerged(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
DefaultSVNMerger.handleMarkResolved(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected abstract SVNMergeResult |
AbstractSVNMerger.processMergedFiles(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
DefaultSVNMerger.processMergedFiles(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
Modifier and Type | Method and Description |
---|---|
SVNMergeResult |
DefaultSvnMerger.mergeProperties(String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun) |
SVNMergeResult |
DefaultSvnMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options) |
Modifier and Type | Method and Description |
---|---|
static SVNMergeResult |
SVNMergeResult.createMergeResult(SVNStatusType status,
SVNConflictReason reason)
Creates a new merge result object.
|
SVNMergeResult |
ISVNMerger.mergeProperties(String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun)
Given
adminArea /localPath and property changes (propDiff ) based
on serverBaseProps , merges the changes into the working copy. |
SVNMergeResult |
ISVNMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options)
Performs a text merge.
|
Copyright © 2022. All rights reserved.