Class SvnNgMerge
java.lang.Object
org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner<V,T>
org.tmatesoft.svn.core.internal.wc2.SvnLocalOperationRunner<V,T>
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner<Void,SvnMerge>
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMerge
- All Implemented Interfaces:
ISVNCanceller
,ISVNEventHandler
,ISvnOperationRunner<Void,
SvnMerge>
-
Field Summary
Fields inherited from interface org.tmatesoft.svn.core.ISVNCanceller
NULL
Fields inherited from interface org.tmatesoft.svn.core.wc.ISVNEventHandler
UNKNOWN
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprivate File
getLockPath
(File firstTarget) boolean
isApplicable
(SvnMerge operation, SvnWcGeneration wcGeneration) Returns whether this runner is applicable for the operation on concrete working copy generation (1.7 or 1.6)private SvnConflictReport
protected Void
run
(SVNWCContext context) Methods inherited from class org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner
deleteDeleteFiles, getRepositoryAccess, getWcGeneration, matchesChangelist, reset, run, setRepositoryAccess
Methods inherited from class org.tmatesoft.svn.core.internal.wc2.SvnLocalOperationRunner
getFirstTarget, sleepForTimestamp
Methods inherited from class org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner
checkCancelled, getOperation, getWcContext, handleEvent, handleEvent, run, setOperation, setWcContext
-
Constructor Details
-
SvnNgMerge
public SvnNgMerge()
-
-
Method Details
-
isApplicable
Description copied from interface:ISvnOperationRunner
Returns whether this runner is applicable for the operation on concrete working copy generation (1.7 or 1.6)- Specified by:
isApplicable
in interfaceISvnOperationRunner<Void,
SvnMerge> - Overrides:
isApplicable
in classSvnLocalOperationRunner<Void,
SvnMerge> - Parameters:
operation
- operation that needs runnerwcGeneration
- working copy generation- Returns:
true
if the runner is applicable, otherwisefalse
- Throws:
SVNException
-
run
- Specified by:
run
in classSvnNgOperationRunner<Void,
SvnMerge> - Throws:
SVNException
-
getLockPath
- Throws:
SVNException
-
merge
- Throws:
SVNException
-