view release on metacpan or  search on metacpan

src/subversion/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java  view on Meta::CPAN

    /**
     * Create a new conflict result instace.
     */
    public ConflictResult(Choice choice, String mergedPath)
    {
      this.choice = choice;
      this.mergedPath = mergedPath;
    }

    /**
     * @return A value corresponding to the
     * <code>svn_wc_conflict_choice_t</code> enum.
     */
    public Choice getChoice()
    {
        return choice;
    }

    /**
     * @return The path to the result of a merge, or <code>null</code>.
     */
    public String getMergedPath()
    {
        return mergedPath;
    }

    public enum Choice
    {
        /** Nothing done to resolve the conflict; conflict remains.  */
        postpone,

        /** Resolve the conflict by choosing the base file.  */
        chooseBase,

        /**
         * Resolve the conflict by choosing the incoming (repository)
         * version of the object.
         */
        chooseTheirsFull,

        /**
         * Resolve the conflict by choosing own (local) version of the
         * object.
         */
        chooseMineFull,

        /**
         * Resolve the conflict by choosing the incoming (repository)
         * version of the object (for conflicted hunks only).
         */
        chooseTheirsConflict,

        /**
         * Resolve the conflict by choosing own (local) version of the
         * object (for conflicted hunks only).
         */
        chooseMineConflict,

        /**
         * Resolve the conflict by choosing the merged object
         * (potentially manually edited).
         */
        chooseMerged;
    }
}