public class SVNMergeCallback15 extends SVNMergeCallback
myAddedPath, myConflictedPaths, myDiffOptions, myIsAddNecessitatedMerge, myIsDryRun, myIsForce, myMergeDriver, myURL
Constructor and Description |
---|
SVNMergeCallback15(SVNAdminArea adminArea,
SVNURL url,
boolean force,
boolean dryRun,
SVNDiffOptions options,
java.util.Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
Modifier and Type | Method and Description |
---|---|
protected void |
delete(java.io.File path,
boolean force,
boolean dryRun) |
SVNStatusType |
directoryAdded(java.lang.String path,
long revision,
boolean[] isTreeConflicted) |
SVNStatusType[] |
directoryClosed(java.lang.String path,
boolean[] isTreeConflicted) |
SVNStatusType |
directoryDeleted(java.lang.String path,
boolean[] isTreeConflicted) |
void |
directoryOpened(java.lang.String path,
long revision,
boolean[] isTreeConflicted) |
SVNStatusType[] |
fileAdded(java.lang.String path,
java.io.File file1,
java.io.File file2,
long revision1,
long revision2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
SVNStatusType[] |
fileChanged(java.lang.String path,
java.io.File file1,
java.io.File file2,
long revision1,
long revision2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
SVNStatusType |
fileDeleted(java.lang.String path,
java.io.File file1,
java.io.File file2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
boolean[] isTreeConflicted) |
SVNStatusType |
propertiesChanged(java.lang.String path,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
areFilesTheSame, createTempDirectory, delete, getConflictedPaths, getFile, isDiffCopiedAsAdded, isDiffUnversioned, retrieve
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
public SVNMergeCallback15(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
public SVNStatusType propertiesChanged(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
propertiesChanged
in class SVNMergeCallback
SVNException
public SVNStatusType directoryAdded(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException
directoryAdded
in class SVNMergeCallback
SVNException
public SVNStatusType directoryDeleted(java.lang.String path, boolean[] isTreeConflicted) throws SVNException
directoryDeleted
in class SVNMergeCallback
SVNException
public void directoryOpened(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException
directoryOpened
in class SVNMergeCallback
SVNException
public SVNStatusType[] fileChanged(java.lang.String path, java.io.File file1, java.io.File file2, long revision1, long revision2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
fileChanged
in class SVNMergeCallback
SVNException
public SVNStatusType[] fileAdded(java.lang.String path, java.io.File file1, java.io.File file2, long revision1, long revision2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
fileAdded
in class SVNMergeCallback
SVNException
public SVNStatusType fileDeleted(java.lang.String path, java.io.File file1, java.io.File file2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException
fileDeleted
in class SVNMergeCallback
SVNException
public SVNStatusType[] directoryClosed(java.lang.String path, boolean[] isTreeConflicted) throws SVNException
directoryClosed
in class SVNMergeCallback
SVNException
protected void delete(java.io.File path, boolean force, boolean dryRun) throws SVNException
SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.