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<java.lang.Void,SvnMerge>
-
- org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMerge
-
- All Implemented Interfaces:
ISVNCanceller
,ISVNEventHandler
,ISvnOperationRunner<java.lang.Void,SvnMerge>
public class SvnNgMerge extends SvnNgOperationRunner<java.lang.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 Constructor Description SvnNgMerge()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description private java.io.File
getLockPath(java.io.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
merge(java.io.File target)
protected java.lang.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
-
-
-
-
Method Detail
-
isApplicable
public boolean isApplicable(SvnMerge operation, SvnWcGeneration wcGeneration) throws SVNException
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<java.lang.Void,SvnMerge>
- Overrides:
isApplicable
in classSvnLocalOperationRunner<java.lang.Void,SvnMerge>
- Parameters:
operation
- operation that needs runnerwcGeneration
- working copy generation- Returns:
true
if the runner is applicable, otherwisefalse
- Throws:
SVNException
-
run
protected java.lang.Void run(SVNWCContext context) throws SVNException
- Specified by:
run
in classSvnNgOperationRunner<java.lang.Void,SvnMerge>
- Throws:
SVNException
-
getLockPath
private java.io.File getLockPath(java.io.File firstTarget) throws SVNException
- Throws:
SVNException
-
merge
private SvnConflictReport merge(java.io.File target) throws SVNException
- Throws:
SVNException
-
-