Class SVNTreeConflictDescription


  • public class SVNTreeConflictDescription
    extends SVNConflictDescription
    SVNTreeConflictDescription brings information on a tree conflict.
    Since:
    1.3
    Version:
    1.3
    Author:
    TMate Software Ltd.
    • Constructor Detail

      • SVNTreeConflictDescription

        public SVNTreeConflictDescription​(java.io.File path,
                                          SVNNodeKind nodeKind,
                                          SVNConflictAction conflictAction,
                                          SVNConflictReason conflictReason,
                                          SVNOperation operation,
                                          SVNConflictVersion sourceLeftVersion,
                                          SVNConflictVersion sourceRightVersion)
        Creates a new SVNTreeConflictDescription.
        Parameters:
        path - wc path
        nodeKind - kind of the node, on which the tree conflict occurred
        conflictAction - action which lead to the conflict
        conflictReason - reason why the conflict occurred
        operation - user operation which exposed the conflict
        sourceLeftVersion - info on the "merge-left source" or "older" version of incoming change
        sourceRightVersion - info on the "merge-right source" or "their" version of incoming change
        Since:
        1.3
    • Method Detail

      • getPath

        public java.io.File getPath()
        Returns the wc file.
        Overrides:
        getPath in class SVNConflictDescription
        Returns:
        detranslated wc file
        Since:
        1.3
      • getOperation

        public SVNOperation getOperation()
        Returns the user operation that exposed this tree conflict.
        Returns:
        user operation
        Since:
        1.3
      • getSourceLeftVersion

        public SVNConflictVersion getSourceLeftVersion()
        Returns info on the "merge-left source" or "older" version of incoming change.
        Returns:
        left version info
        Since:
        1.3
      • setSourceLeftVersion

        public void setSourceLeftVersion​(SVNConflictVersion sourceLeftVersion)
      • getSourceRightVersion

        public SVNConflictVersion getSourceRightVersion()
        Returns info on the "merge-right source" or "their" version of incoming change.
        Returns:
        right version info
        Since:
        1.3