Class SVNConflictDescriptor

java.lang.Object
org.tigris.subversion.svnclientadapter.SVNConflictDescriptor

public class SVNConflictDescriptor extends Object
The description of a merge conflict, encountered during merge/update/switch operations. copied from JavaHL ConflictDescriptor
  • Constructor Details

  • Method Details

    • getPath

      public String getPath()
    • getConflictKind

      public int getConflictKind()
    • getNodeKind

      public int getNodeKind()
    • getPropertyName

      public String getPropertyName()
    • isBinary

      public boolean isBinary()
    • getMIMEType

      public String getMIMEType()
    • getAction

      public int getAction()
    • getReason

      public int getReason()
    • isTreeConflict

      public boolean isTreeConflict()
    • getOperation

      public int getOperation()
    • getSrcLeftVersion

      public SVNConflictVersion getSrcLeftVersion()
    • getSrcRightVersion

      public SVNConflictVersion getSrcRightVersion()
    • getBasePath

      public String getBasePath()
    • getTheirPath

      public String getTheirPath()
    • getMyPath

      public String getMyPath()
    • getMergedPath

      public String getMergedPath()