Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc.admin | |
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 | Field and Description |
---|---|
private SVNLog |
SVNUpdateEditor.SVNDirectoryInfo.log |
private SVNLog |
SVNUpdateEditor15.SVNDirectoryInfo.log |
Modifier and Type | Method and Description |
---|---|
SVNLog |
SVNUpdateEditor.SVNDirectoryInfo.getLog() |
SVNLog |
SVNUpdateEditor15.SVNDirectoryInfo.getLog() |
Modifier and Type | Method and Description |
---|---|
static void |
SVNWCManager.addProperties(SVNAdminArea dir,
java.lang.String fileName,
SVNProperties properties,
boolean base,
SVNLog log) |
private SVNStatusType |
DefaultSVNMerger.applySingleGenericPropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
DefaultSVNMerger.applySingleMergeInfoPropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
DefaultSVNMerger.applySinglePropertyAdd(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
DefaultSVNMerger.applySinglePropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
DefaultSVNMerger.applySinglePropertyDelete(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNTreeConflictDescription |
SVNUpdateEditor.checkTreeConflict(java.io.File path,
SVNEntry entry,
SVNAdminArea parentArea,
SVNLog log,
SVNConflictAction action,
SVNNodeKind theirKind,
SVNURL theirURL) |
private boolean |
DefaultSVNMerger.maybeGeneratePropConflict(java.lang.String localPath,
java.lang.String propName,
SVNProperties workingProps,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue baseValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
boolean isDir,
boolean dryRun) |
SVNMergeResult |
DefaultSVNMerger.mergeProperties(java.lang.String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun) |
Modifier and Type | Class and Description |
---|---|
class |
SVNLogImpl |
Modifier and Type | Method and Description |
---|---|
SVNLog |
SVNAdminArea.getLog() |
Modifier and Type | Method and Description |
---|---|
private void |
SVNAdminArea.handleCharsetProperty(SVNAdminArea adminArea,
SVNLog log,
SVNEntry entry,
SVNVersionedProperties baseProps) |
private void |
SVNAdminArea.handlePropTime(SVNLog log,
SVNEntry entry) |
void |
SVNXMLAdminArea.installProperties(java.lang.String name,
SVNProperties baseProps,
SVNProperties workingProps,
SVNLog log,
boolean writeBaseProps,
boolean close) |
abstract void |
SVNAdminArea.installProperties(java.lang.String name,
SVNProperties baseProps,
SVNProperties workingProps,
SVNLog log,
boolean writeBaseProps,
boolean close) |
void |
SVNAdminArea14.installProperties(java.lang.String name,
SVNProperties baseProps,
SVNProperties workingProps,
SVNLog log,
boolean writeBaseProps,
boolean close) |
SVNStatusType |
SVNAdminArea.mergeProperties(java.lang.String name,
SVNProperties serverBaseProps,
SVNProperties propDiff,
java.lang.String localLabel,
java.lang.String latestLabel,
boolean baseMerge,
boolean dryRun,
SVNLog log) |
SVNStatusType |
SVNAdminArea.mergeProperties(java.lang.String name,
SVNProperties serverBaseProps,
SVNProperties baseProps,
SVNProperties workingProps,
SVNProperties propDiff,
java.lang.String localLabel,
java.lang.String latestLabel,
boolean baseMerge,
boolean dryRun,
SVNLog log) |
SVNStatusType |
SVNAdminArea.mergeText(java.lang.String localPath,
java.io.File base,
java.io.File latest,
java.io.File copyFromText,
java.lang.String localLabel,
java.lang.String baseLabel,
java.lang.String latestLabel,
SVNProperties propChanges,
boolean dryRun,
SVNDiffOptions options,
SVNLog log) |
private void |
SVNXMLAdminArea.saveBaseProperties(SVNLog log) |
private void |
SVNXMLAdminArea.saveProperties(SVNLog log) |
void |
SVNXMLAdminArea.saveVersionedProperties(SVNLog log,
boolean close) |
abstract void |
SVNAdminArea.saveVersionedProperties(SVNLog log,
boolean close) |
void |
SVNAdminArea14.saveVersionedProperties(SVNLog log,
boolean close) |
Modifier and Type | Method and Description |
---|---|
SVNMergeResult |
DefaultSvnMerger.mergeProperties(java.lang.String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun) |
Modifier and Type | Field and Description |
---|---|
private SVNLog |
SVNMergeFileSet.myLog |
Modifier and Type | Method and Description |
---|---|
SVNLog |
SVNMergeFileSet.getLog()
Returns the log object.
|
Modifier and Type | Method and Description |
---|---|
SVNMergeResult |
ISVNMerger.mergeProperties(java.lang.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. |
Constructor and Description |
---|
SVNMergeFileSet(SVNAdminArea adminArea,
SVNLog log,
java.io.File baseFile,
java.io.File localFile,
java.lang.String wcPath,
java.io.File reposFile,
java.io.File resultFile,
java.io.File copyFromFile,
java.lang.String mimeType)
Creates a new
SVNMergeFileSet object given the data prepared for
merging a file. |