org.tmatesoft.svn.core.internal.wc

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

public class SVNMergeCallback15
extends SVNMergeCallback

Version:

1.3

Author:

TMate Software Ltd.

Field Summary

Fields inherited from class org.tmatesoft.svn.core.internal.wc.SVNMergeCallback

myAddedPath, myConflictedPaths, myDiffOptions, myIsAddNecessitatedMerge, myIsDryRun, myIsForce, myMergeDriver, myURL

Constructor Summary

Constructors

Constructor and Description
SVNMergeCallback15(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, Map conflictedPathsGetter, SVNMergeDriver mergeDriver)

Method Summary

Modifier and Type	Method and Description
protected void	delete(File path, boolean force, boolean dryRun)
SVNStatusType	directoryAdded(String path, long revision, boolean[] isTreeConflicted)
SVNStatusType[]	directoryClosed(String path, boolean[] isTreeConflicted)
SVNStatusType	directoryDeleted(String path, boolean[] isTreeConflicted)
void	directoryOpened(String path, long revision, boolean[] isTreeConflicted)
SVNStatusType[]	fileAdded(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted)
SVNStatusType[]	fileChanged(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted)
SVNStatusType	fileDeleted(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted)
SVNStatusType	propertiesChanged(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 Detail

SVNMergeCallback15

public SVNMergeCallback15(SVNAdminArea adminArea,
                          SVNURL url,
                          boolean force,
                          boolean dryRun,
                          SVNDiffOptions options,
                          Map conflictedPathsGetter,
                          SVNMergeDriver mergeDriver)

Method Detail

propertiesChanged

public SVNStatusType propertiesChanged(String path,
                                       SVNProperties originalProperties,
                                       SVNProperties diff,
                                       boolean[] isTreeConflicted)
                                throws SVNException

Overrides:

propertiesChanged in class SVNMergeCallback

Throws:

SVNException

directoryAdded

public SVNStatusType directoryAdded(String path,
                                    long revision,
                                    boolean[] isTreeConflicted)
                             throws SVNException

Overrides:

directoryAdded in class SVNMergeCallback

Throws:

SVNException

directoryDeleted

public SVNStatusType directoryDeleted(String path,
                                      boolean[] isTreeConflicted)
                               throws SVNException

Overrides:

directoryDeleted in class SVNMergeCallback

Throws:

SVNException

directoryOpened

public void directoryOpened(String path,
                            long revision,
                            boolean[] isTreeConflicted)
                     throws SVNException

Overrides:

directoryOpened in class SVNMergeCallback

Throws:

SVNException

fileChanged

public SVNStatusType[] fileChanged(String path,
                                   File file1,
                                   File file2,
                                   long revision1,
                                   long revision2,
                                   String mimeType1,
                                   String mimeType2,
                                   SVNProperties originalProperties,
                                   SVNProperties diff,
                                   boolean[] isTreeConflicted)
                            throws SVNException

Overrides:

fileChanged in class SVNMergeCallback

Throws:

SVNException

fileAdded

public SVNStatusType[] fileAdded(String path,
                                 File file1,
                                 File file2,
                                 long revision1,
                                 long revision2,
                                 String mimeType1,
                                 String mimeType2,
                                 SVNProperties originalProperties,
                                 SVNProperties diff,
                                 boolean[] isTreeConflicted)
                          throws SVNException

Overrides:

fileAdded in class SVNMergeCallback

Throws:

SVNException

fileDeleted

public SVNStatusType fileDeleted(String path,
                                 File file1,
                                 File file2,
                                 String mimeType1,
                                 String mimeType2,
                                 SVNProperties originalProperties,
                                 boolean[] isTreeConflicted)
                          throws SVNException

Overrides:

fileDeleted in class SVNMergeCallback

Throws:

SVNException

directoryClosed

public SVNStatusType[] directoryClosed(String path,
                                       boolean[] isTreeConflicted)
                                throws SVNException

Overrides:

directoryClosed in class SVNMergeCallback

Throws:

SVNException

delete

protected void delete(File path,
                      boolean force,
                      boolean dryRun)
               throws SVNException

Throws:

SVNException