Class ConflictVersion

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

public class ConflictVersion extends java.lang.Object
The description of a merge conflict, encountered during merge/update/switch operations.
Since:
1.6
  • Field Summary

    Fields
    Modifier and Type
    Field
    Description
    private int
     
    private java.lang.String
     
    private long
     
    private java.lang.String
     
  • Constructor Summary

    Constructors
    Constructor
    Description
    ConflictVersion(java.lang.String reposURL, long pegRevision, java.lang.String pathInRepos, int nodeKind)
    This constructor should only be called from JNI code.
    A backward-compat constructor.
  • Method Summary

    Modifier and Type
    Method
    Description
    int
     
    java.lang.String
     
    long
     
    java.lang.String
     
    java.lang.String
     

    Methods inherited from class java.lang.Object

    clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
  • Field Details

    • reposURL

      private java.lang.String reposURL
    • pegRevision

      private long pegRevision
    • pathInRepos

      private java.lang.String pathInRepos
    • nodeKind

      private int nodeKind
      See Also:
  • Constructor Details

    • ConflictVersion

      ConflictVersion(java.lang.String reposURL, long pegRevision, java.lang.String pathInRepos, int nodeKind)
      This constructor should only be called from JNI code.
    • ConflictVersion

      public ConflictVersion(ConflictVersion aVer)
      A backward-compat constructor.
  • Method Details

    • getReposURL

      public java.lang.String getReposURL()
    • getPegRevision

      public long getPegRevision()
    • getPathInRepos

      public java.lang.String getPathInRepos()
    • getNodeKind

      public int getNodeKind()
      See Also:
    • toString

      public java.lang.String toString()
      Overrides:
      toString in class java.lang.Object