Class ConflictDescriptor

java.lang.Object
org.tigris.subversion.javahl.ConflictDescriptor

public class ConflictDescriptor extends Object
The description of a merge conflict, encountered during merge/update/switch operations.
Since:
1.5
  • Field Details

    • path

      private String path
    • conflictKind

      private int conflictKind
    • nodeKind

      private int nodeKind
      See Also:
    • propertyName

      private String propertyName
    • isBinary

      private boolean isBinary
    • mimeType

      private String mimeType
    • action

      private int action
      See Also:
      • #Action
    • reason

      private int reason
      See Also:
      • #Reason
    • basePath

      private String basePath
    • theirPath

      private String theirPath
    • myPath

      private String myPath
    • mergedPath

      private String mergedPath
    • operation

      private int operation
      See Also:
    • srcLeftVersion

      private ConflictVersion srcLeftVersion
      See Also:
    • srcRightVersion

      private ConflictVersion srcRightVersion
      See Also:
  • Constructor Details

  • Method Details

    • getPath

      public String getPath()
    • getKind

      public int getKind()
    • getNodeKind

      public int getNodeKind()
      See Also:
    • getPropertyName

      public String getPropertyName()
    • isBinary

      public boolean isBinary()
    • getMIMEType

      public String getMIMEType()
    • getAction

      public int getAction()
    • getReason

      public int getReason()
    • getBasePath

      public String getBasePath()
    • getTheirPath

      public String getTheirPath()
    • getMyPath

      public String getMyPath()
    • getMergedPath

      public String getMergedPath()
    • getOperation

      public int getOperation()
    • getSrcLeftVersion

      public ConflictVersion getSrcLeftVersion()
    • getSrcRightVersion

      public ConflictVersion getSrcRightVersion()