Package org.tigris.subversion.svnclientadapter

Class SVNConflictResult

  • public class SVNConflictResult
extends java.lang.Object
    The result returned by the callback API used to handle conflicts encountered during merge/update/switch operations.

    • Field Summary

      Fields 
      Modifier and Type Field Description
      static int chooseBase
      Resolve the conflict by choosing the base file.
      static int chooseMerged
      Resolve the conflict by choosing the merged object (potentially manually edited).
      static int chooseMine
      Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
      static int chooseMineFull
      Resolve the conflict by choosing own (local) version of the object.
      static int chooseTheirs
      Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
      static int chooseTheirsFull
      Resolve the conflict by choosing the incoming (repository) version of the object.
      static int postpone
      Nothing done to resolve the conflict; conflict remains.

    • Constructor Summary

      Constructors 
      Constructor Description
      SVNConflictResult​(int choice, java.lang.String mergedPath)
      Create a new conflict result instace.

    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      int getChoice()  
      java.lang.String getMergedPath()  

      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

    • Field Detail

      • postpone

        public static final int postpone
        Nothing done to resolve the conflict; conflict remains.
        See Also:
        Constant Field Values

      • chooseBase

        public static final int chooseBase
        Resolve the conflict by choosing the base file.
        See Also:
        Constant Field Values

      • chooseTheirsFull

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

      • chooseMineFull

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

      • chooseTheirs

        public static final int chooseTheirs
        Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
        See Also:
        Constant Field Values

      • chooseMine

        public static final int chooseMine
        Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
        See Also:
        Constant Field Values

      • chooseMerged

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

    • Constructor Detail

      • SVNConflictResult

        public SVNConflictResult​(int choice,
                         java.lang.String mergedPath)
        Create a new conflict result instace.

    • Method Detail

      • 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.