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>

public class SvnNgMerge extends SvnNgOperationRunner<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

Modifier and Type

Method

Description

private 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

merge(File target)

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

Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Details
- SvnNgMerge
  
  public SvnNgMerge()
Method Details
- 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 interface ISvnOperationRunner<Void,SvnMerge>
  
  Overrides:
  
  isApplicable in class SvnLocalOperationRunner<Void,SvnMerge>
  
  Parameters:
  
  operation - operation that needs runner
  
  wcGeneration - working copy generation
  
  Returns:
  
  true if the runner is applicable, otherwise false
  
  Throws:
  
  SVNException
- run
  
  protected Void run(SVNWCContext context) throws SVNException
  
  Specified by:
  
  run in class SvnNgOperationRunner<Void,SvnMerge>
  
  Throws:
  
  SVNException
- getLockPath
  
  private File getLockPath(File firstTarget) throws SVNException
  
  Throws:
  
  SVNException
- merge
  
  private SvnConflictReport merge(File target) throws SVNException
  
  Throws:
  
  SVNException