Class ConflictVersion


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

      • reposURL

        private java.lang.String reposURL
      • reposUUID

        private java.lang.String reposUUID
      • pegRevision

        private long pegRevision
      • pathInRepos

        private java.lang.String pathInRepos
    • Constructor Detail

      • ConflictVersion

        ConflictVersion​(java.lang.String reposURL,
                        java.lang.String reposUUID,
                        long pegRevision,
                        java.lang.String pathInRepos,
                        NodeKind nodeKind)
        This constructor should only be called from JNI code.
    • Method Detail

      • getReposURL

        public java.lang.String getReposURL()
      • getReposUUID

        public java.lang.String getReposUUID()
        Since:
        1.8
      • getPegRevision

        public long getPegRevision()
      • getPathInRepos

        public java.lang.String getPathInRepos()
      • toString

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