Package org.tigris.subversion.javahl

Class ConflictResult

java.lang.Object
org.tigris.subversion.javahl.ConflictResult
public class ConflictResult
extends 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
    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 chooseMineConflict
    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 chooseTheirsConflict
    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
    ConflictResult​(int choice, String mergedPath)
    Create a new conflict result instance.

  • Method Summary

    Modifier and Type Method Description
    int getChoice()  
    String getMergedPath()  
    ConflictResult toApache()  

    Methods inherited from class java.lang.Object

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