public class SvnNgMerge extends SvnNgOperationRunner<java.lang.Void,SvnMerge>
UNKNOWN
NULL
Constructor and Description |
---|
SvnNgMerge() |
Modifier and Type | Method and 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) |
deleteDeleteFiles, getRepositoryAccess, getWcGeneration, matchesChangelist, reset, run, setRepositoryAccess
getFirstTarget, sleepForTimestamp
checkCancelled, getOperation, getWcContext, handleEvent, handleEvent, run, setOperation, setWcContext
public boolean isApplicable(SvnMerge operation, SvnWcGeneration wcGeneration) throws SVNException
ISvnOperationRunner
isApplicable
in interface ISvnOperationRunner<java.lang.Void,SvnMerge>
isApplicable
in class SvnLocalOperationRunner<java.lang.Void,SvnMerge>
operation
- operation that needs runnerwcGeneration
- working copy generationtrue
if the runner is applicable, otherwise false
SVNException
protected java.lang.Void run(SVNWCContext context) throws SVNException
run
in class SvnNgOperationRunner<java.lang.Void,SvnMerge>
SVNException
private java.io.File getLockPath(java.io.File firstTarget) throws SVNException
SVNException
private SvnConflictReport merge(java.io.File target) throws SVNException
SVNException