Class ConflictResult

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

public class ConflictResult extends java.lang.Object
The result returned by the callback API used to handle conflicts encountered during merge/update/switch operations. Includes a poor man's enum for svn_wc_conflict_choice_t.
Since:
1.5
  • Field Summary

    Fields
    Modifier and Type
    Field
    Description
    private int
    A value corresponding to the svn_wc_conflict_choice_t enum.
    static final int
    Resolve the conflict by choosing the base file.
    static final int
    Resolve the conflict by choosing the merged object (potentially manually edited).
    static final int
    Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
    static final int
    Resolve the conflict by choosing own (local) version of the object.
    static final int
    Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
    static final int
    Resolve the conflict by choosing the incoming (repository) version of the object.
    private java.lang.String
    The path to the result of a merge, or null.
    static final int
    Nothing done to resolve the conflict; conflict remains.
  • Constructor Summary

    Constructors
    Constructor
    Description
    ConflictResult(int choice, java.lang.String mergedPath)
    Create a new conflict result instace.
  • Method Summary

    Modifier and Type
    Method
    Description
    int
     
    java.lang.String
     
     

    Methods inherited from class java.lang.Object

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

    • postpone

      public static final int postpone
      Nothing done to resolve the conflict; conflict remains.
      See Also:
    • chooseBase

      public static final int chooseBase
      Resolve the conflict by choosing the base file.
      See Also:
    • chooseTheirsFull

      public static final int chooseTheirsFull
      Resolve the conflict by choosing the incoming (repository) version of the object.
      See Also:
    • chooseMineFull

      public static final int chooseMineFull
      Resolve the conflict by choosing own (local) version of the object.
      See Also:
    • chooseTheirsConflict

      public static final int chooseTheirsConflict
      Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
      See Also:
    • chooseMineConflict

      public static final int chooseMineConflict
      Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
      See Also:
    • chooseMerged

      public static final int chooseMerged
      Resolve the conflict by choosing the merged object (potentially manually edited).
      See Also:
    • choice

      private int choice
      A value corresponding to the svn_wc_conflict_choice_t enum.
    • mergedPath

      private java.lang.String mergedPath
      The path to the result of a merge, or null.
  • Constructor Details

    • ConflictResult

      public ConflictResult(int choice, java.lang.String mergedPath)
      Create a new conflict result instace.
  • Method Details

    • toApache

      public ConflictResult toApache()
    • getChoice

      public int getChoice()
      Returns:
      A value corresponding to the svn_wc_conflict_choice_t enum.
    • getMergedPath

      public java.lang.String getMergedPath()
      Returns:
      The path to the result of a merge, or null.