Class SVNMergeCallback15
java.lang.Object
org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
org.tmatesoft.svn.core.internal.wc.SVNMergeCallback
org.tmatesoft.svn.core.internal.wc.SVNMergeCallback15
- Version:
- 1.3
-
Field Summary
Fields inherited from class org.tmatesoft.svn.core.internal.wc.SVNMergeCallback
myAddedPath, myConflictedPaths, myDiffOptions, myIsAddNecessitatedMerge, myIsDryRun, myIsForce, myMergeDriver, myURL
-
Constructor Summary
ConstructorsConstructorDescriptionSVNMergeCallback15
(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver) -
Method Summary
Modifier and TypeMethodDescriptionprotected void
delete
(java.io.File path, boolean force, boolean dryRun) directoryAdded
(java.lang.String path, long revision, boolean[] isTreeConflicted) directoryClosed
(java.lang.String path, boolean[] isTreeConflicted) directoryDeleted
(java.lang.String path, boolean[] isTreeConflicted) void
directoryOpened
(java.lang.String path, long revision, boolean[] isTreeConflicted) 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) 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) 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) propertiesChanged
(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) Methods inherited from class org.tmatesoft.svn.core.internal.wc.SVNMergeCallback
areFilesTheSame, createTempDirectory, delete, getConflictedPaths, getFile, isDiffCopiedAsAdded, isDiffUnversioned, retrieve
Methods inherited from class org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Constructor Details
-
SVNMergeCallback15
public SVNMergeCallback15(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
-
-
Method Details
-
propertiesChanged
public SVNStatusType propertiesChanged(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException - Overrides:
propertiesChanged
in classSVNMergeCallback
- Throws:
SVNException
-
directoryAdded
public SVNStatusType directoryAdded(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException - Overrides:
directoryAdded
in classSVNMergeCallback
- Throws:
SVNException
-
directoryDeleted
public SVNStatusType directoryDeleted(java.lang.String path, boolean[] isTreeConflicted) throws SVNException - Overrides:
directoryDeleted
in classSVNMergeCallback
- Throws:
SVNException
-
directoryOpened
public void directoryOpened(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException - Overrides:
directoryOpened
in classSVNMergeCallback
- Throws:
SVNException
-
fileChanged
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 - Overrides:
fileChanged
in classSVNMergeCallback
- Throws:
SVNException
-
fileAdded
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 - Overrides:
fileAdded
in classSVNMergeCallback
- Throws:
SVNException
-
fileDeleted
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 - Overrides:
fileDeleted
in classSVNMergeCallback
- Throws:
SVNException
-
directoryClosed
public SVNStatusType[] directoryClosed(java.lang.String path, boolean[] isTreeConflicted) throws SVNException - Overrides:
directoryClosed
in classSVNMergeCallback
- Throws:
SVNException
-
delete
- Throws:
SVNException
-